diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 18:56:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 18:56:05 +0200 |
| commit | 5884c40668a928bba017eaf54e2eb3c01c8a98e6 (patch) | |
| tree | 240bdf1b015f0bc2ce8c1811bd0b528c1ef386c2 /drivers/hid/usbhid/hid-zpff.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release() (diff) | |
| download | linux-5884c40668a928bba017eaf54e2eb3c01c8a98e6.tar.xz linux-5884c40668a928bba017eaf54e2eb3c01c8a98e6.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
HID: add hooks for getkeycode() and setkeycode() methods
HID: switch to using input_dev->dev.parent
USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk
USB HID: usb_buffer_free() cleanup
USB HID: report descriptor of Cypress USB barcode readers needs fixup
Bluetooth HID: HIDP - don't initialize force feedback
USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description
HID: add input mappings for non-working keys on Logitech S510 remote
Diffstat (limited to 'drivers/hid/usbhid/hid-zpff.c')
| -rw-r--r-- | drivers/hid/usbhid/hid-zpff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/usbhid/hid-zpff.c index 7bd8238ca212..a7fbffcdaf36 100644 --- a/drivers/hid/usbhid/hid-zpff.c +++ b/drivers/hid/usbhid/hid-zpff.c @@ -37,7 +37,7 @@ struct zpff_device { static int hid_zpff_play(struct input_dev *dev, void *data, struct ff_effect *effect) { - struct hid_device *hid = dev->private; + struct hid_device *hid = input_get_drvdata(dev); struct zpff_device *zpff = data; int left, right; |