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

USB: Add device quirk for ASUS T100 Base Station keyboard

commit ddbe1fca upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54d95e00
...@@ -1983,8 +1983,10 @@ void usb_set_device_state(struct usb_device *udev, ...@@ -1983,8 +1983,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;
} }
......
...@@ -160,6 +160,10 @@ static const struct usb_device_id usb_interface_quirk_list[] = { ...@@ -160,6 +160,10 @@ static const struct usb_device_id usb_interface_quirk_list[] = {
{ USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0),
.driver_info = USB_QUIRK_RESET_RESUME }, .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 */
}; };
......
...@@ -30,4 +30,7 @@ ...@@ -30,4 +30,7 @@
descriptor */ descriptor */
#define USB_QUIRK_DELAY_INIT 0x00000040 #define USB_QUIRK_DELAY_INIT 0x00000040
/* 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