diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-17 14:30:50 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-17 14:30:50 +0100 |
| commit | 466a8903bce97b6399195551ca81e2d9773cf577 (patch) | |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid | |
| parent | ec8c12f17550855f44283f28300c6b8de0949ef1 (diff) | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index d08d1c050c7e..56d06cd8075b 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1006,9 +1006,6 @@ static int usbhid_start(struct hid_device *hid) spin_lock_init(&usbhid->lock); - usbhid->intf = intf; - usbhid->ifnum = interface->desc.bInterfaceNumber; - usbhid->urbctrl = usb_alloc_urb(0, GFP_KERNEL); if (!usbhid->urbctrl) { ret = -ENOMEM; @@ -1179,6 +1176,8 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * hid->driver_data = usbhid; usbhid->hid = hid; + usbhid->intf = intf; + usbhid->ifnum = interface->desc.bInterfaceNumber; ret = hid_add_device(hid); if (ret) { |