Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ab12e4 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: usbhid: initialize interface pointers early enough 



Move the initialization of USB interface pointers from _start()
over to _probe() callback, which is where it belongs.

This fixes case where interface is NULL when parsing of report
descriptor fails.

LKML-Reference: <20100213135720.603e5f64@neptune.home>
Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7f978b9b

drivers/hid/usbhid/hid-core.c

+2 −3
Original line number Diff line number Diff line
@@ -1005,9 +1005,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;
@@ -1178,6 +1175,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) {