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

Commit 37093b70 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

USBHID: don't recover device if suspend fails in system sleep 



If suspend callback fails in system sleep context, usb core will
ignore the failure and let the system sleep go ahead further, so this
patch doesn't recover device under this situation, otherwise
may cause resume() confused.

Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 93e4f47f

drivers/hid/usbhid/hid-core.c

+5 −9
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
{

	struct hid_device *hid = usb_get_intfdata(intf);

	struct usbhid_device *usbhid = hid->driver_data;

	int status;

	int status = 0;

	bool driver_suspended = false;



	if (PMSG_IS_AUTO(message)) {
@@ -1520,19 +1520,15 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
		}



	} else {

		if (hid->driver && hid->driver->suspend) {

		/* TODO: resume() might need to handle suspend failure */

		if (hid->driver && hid->driver->suspend)

			status = hid->driver->suspend(hid, message);

			if (status < 0)

				return status;

		}

		driver_suspended = true;

		spin_lock_irq(&usbhid->lock);

		set_bit(HID_SUSPENDED, &usbhid->iofl);

		spin_unlock_irq(&usbhid->lock);

		if (usbhid_wait_io(hid) < 0) {

		if (usbhid_wait_io(hid) < 0)

			status = -EIO;

			goto failed;

		}

	}



	hid_cancel_delayed_stuff(usbhid);
@@ -1544,7 +1540,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
		goto failed;

	}

	dev_dbg(&intf->dev, "suspend\n");

	return 0;

	return status;



 failed:

	hid_resume_common(hid, driver_suspended);