diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /drivers/hid/usbhid/hiddev.c | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/hid/usbhid/hiddev.c')
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 0a29c51114aa..681e620eb95b 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c | |||
| @@ -270,7 +270,7 @@ static int hiddev_open(struct inode *inode, struct file *file) | |||
| 270 | struct hiddev *hiddev; | 270 | struct hiddev *hiddev; |
| 271 | int res; | 271 | int res; |
| 272 | 272 | ||
| 273 | intf = usb_find_interface(&hiddev_driver, iminor(inode)); | 273 | intf = usbhid_find_interface(iminor(inode)); |
| 274 | if (!intf) | 274 | if (!intf) |
| 275 | return -ENODEV; | 275 | return -ENODEV; |
| 276 | hid = usb_get_intfdata(intf); | 276 | hid = usb_get_intfdata(intf); |