diff options
| author | Anssi Hannula <anssi.hannula@gmail.com> | 2007-01-19 19:28:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-01-21 22:18:01 +0100 |
| commit | be8209753b014f2d7a92b2ec3ff82db478fc86d1 (patch) | |
| tree | 2f5a1e5d5b7bbf18c2be569166b86ccd680e9081 /drivers/usb/input/usbhid.h | |
| parent | f7ebf99eb489a02dba2e5a071fde9f5354275a50 (diff) | |
HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage
The commit 4916b3a57fc94664677d439b911b8aaf86c7ec23 introduced a
hid regression between 2.6.19 and 2.6.20-rc1. The device put in
input_dev->cdev is now of type usb_device instead of usb_interface.
Before:
> # readlink -f /sys/class/input/input6/event4/device
> /sys/devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.1
After:
> # readlink -f /sys/class/input/input3/event3/device
> /sys/devices/pci0000:00/0000:00:10.0/usb1/1-1
This causes breakage:
> # udevinfo -q all -n /dev/input/event3
> P: /class/input/input3/event3
> N: input/event3
> S: input/by-path/pci-1-1--event-
> E: ID_SERIAL=noserial
> E: ID_PATH=pci-1-1-
No ID_MODEL, ID_VENDOR, ID_REVISION, ID_TYPE etc etc.
Fix this by assigning the intf->dev into hid->dev, and fixing
all the users.
Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb/input/usbhid.h')
| -rw-r--r-- | drivers/usb/input/usbhid.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/input/usbhid.h b/drivers/usb/input/usbhid.h index 830107e5251..0023f96d429 100644 --- a/drivers/usb/input/usbhid.h +++ b/drivers/usb/input/usbhid.h @@ -80,5 +80,8 @@ struct usbhid_device { }; +#define hid_to_usb_dev(hid_dev) \ + container_of(hid_dev->dev->parent, struct usb_device, dev) + #endif |