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

Commit ddbe1fca authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

USB: Add device quirk for ASUS T100 Base Station keyboard 



This full-speed USB device generates spurious remote wakeup event
as soon as USB_DEVICE_REMOTE_WAKEUP feature is set. As the result,
Linux can't enter system suspend and S0ix power saving modes once
this keyboard is used.

This patch tries to introduce USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk.
With this quirk set, wakeup capability will be ignored during
device configure.

This patch could be back-ported to kernels as old as 2.6.39.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4463e152

drivers/usb/core/hub.c

+4 −2
Original line number Diff line number Diff line
@@ -1984,8 +1984,10 @@ void usb_set_device_state(struct usb_device *udev, 
					|| new_state == USB_STATE_SUSPENDED)

				;	/* No change to wakeup settings */

			else if (new_state == USB_STATE_CONFIGURED)

				wakeup = udev->actconfig->desc.bmAttributes

					 & USB_CONFIG_ATT_WAKEUP;

				wakeup = (udev->quirks &

					USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 :

					udev->actconfig->desc.bmAttributes &

					USB_CONFIG_ATT_WAKEUP;

			else

				wakeup = 0;

		}

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* USB3503 */

	{ USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },



	/* ASUS Base Station(T100) */

	{ USB_DEVICE(0x0b05, 0x17e0), .driver_info =

			USB_QUIRK_IGNORE_REMOTE_WAKEUP },



	{ }  /* terminating entry must be last */

};

include/linux/usb/quirks.h

+3 −0
Original line number Diff line number Diff line
@@ -44,4 +44,7 @@ 
/* device can't handle device_qualifier descriptor requests */

#define USB_QUIRK_DEVICE_QUALIFIER	0x00000100



/* device generates spurious wakeup, ignore remote wakeup capability */

#define USB_QUIRK_IGNORE_REMOTE_WAKEUP	0x00000200



#endif /* __LINUX_USB_QUIRKS_H */