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

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
...@@ -1984,8 +1984,10 @@ void usb_set_device_state(struct usb_device *udev, ...@@ -1984,8 +1984,10 @@ void usb_set_device_state(struct usb_device *udev,
|| new_state == USB_STATE_SUSPENDED) || new_state == USB_STATE_SUSPENDED)
; /* No change to wakeup settings */ ; /* No change to wakeup settings */
else if (new_state == USB_STATE_CONFIGURED) else if (new_state == USB_STATE_CONFIGURED)
wakeup = udev->actconfig->desc.bmAttributes wakeup = (udev->quirks &
& USB_CONFIG_ATT_WAKEUP; USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 :
udev->actconfig->desc.bmAttributes &
USB_CONFIG_ATT_WAKEUP;
else else
wakeup = 0; wakeup = 0;
} }
......
...@@ -163,6 +163,10 @@ static const struct usb_device_id usb_quirk_list[] = { ...@@ -163,6 +163,10 @@ static const struct usb_device_id usb_quirk_list[] = {
/* USB3503 */ /* USB3503 */
{ USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME }, { 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 */ { } /* terminating entry must be last */
}; };
......
...@@ -44,4 +44,7 @@ ...@@ -44,4 +44,7 @@
/* device can't handle device_qualifier descriptor requests */ /* device can't handle device_qualifier descriptor requests */
#define USB_QUIRK_DEVICE_QUALIFIER 0x00000100 #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 */ #endif /* __LINUX_USB_QUIRKS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment