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

Commit fde4e2f7 authored by Alan Stern's avatar Alan Stern Committed by Jiri Kosina
Browse files

HID: fix suspend crash by moving initializations earlier 



Although the usbhid driver allocates its usbhid structure in the probe
routine, several critical fields in that structure don't get
initialized until usbhid_start().  However if report descriptor
parsing fails then usbhid_start() is never called.  This leads to
problems during system suspend -- the system will freeze.

This patch (as1378) fixes the bug by moving the initialization
statements up into usbhid_probe().

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
Tested-By: default avatarBruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fddb33f2

drivers/hid/usbhid/hid-core.c

+6 −7
Original line number Diff line number Diff line
@@ -999,13 +999,6 @@ static int usbhid_start(struct hid_device *hid) 
		}

	}



	init_waitqueue_head(&usbhid->wait);

	INIT_WORK(&usbhid->reset_work, hid_reset);

	INIT_WORK(&usbhid->restart_work, __usbhid_restart_queues);

	setup_timer(&usbhid->io_retry, hid_retry_timeout, (unsigned long) hid);



	spin_lock_init(&usbhid->lock);



	usbhid->urbctrl = usb_alloc_urb(0, GFP_KERNEL);

	if (!usbhid->urbctrl) {

		ret = -ENOMEM;
@@ -1179,6 +1172,12 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * 
	usbhid->intf = intf;

	usbhid->ifnum = interface->desc.bInterfaceNumber;



	init_waitqueue_head(&usbhid->wait);

	INIT_WORK(&usbhid->reset_work, hid_reset);

	INIT_WORK(&usbhid->restart_work, __usbhid_restart_queues);

	setup_timer(&usbhid->io_retry, hid_retry_timeout, (unsigned long) hid);

	spin_lock_init(&usbhid->lock);



	ret = hid_add_device(hid);

	if (ret) {

		if (ret != -ENODEV)