diff options
author | Lu Baolu <baolu.lu@linux.intel.com> | 2014-09-18 22:13:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-24 01:20:59 -0400 |
commit | ddbe1fca0bcb87ca8c199ea873a456ca8a948567 (patch) | |
tree | 763399fda347f95dff9fa00bc804286599528909 /drivers/usb/core | |
parent | 4463e1526780ad1c4a15ef5d68cdc19315303d44 (diff) |
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: Lu Baolu <baolu.lu@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hub.c | 6 | ||||
-rw-r--r-- | drivers/usb/core/quirks.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index db1d587cbb95..d5419292f89f 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1984,8 +1984,10 @@ void usb_set_device_state(struct usb_device *udev, | |||
1984 | || new_state == USB_STATE_SUSPENDED) | 1984 | || new_state == USB_STATE_SUSPENDED) |
1985 | ; /* No change to wakeup settings */ | 1985 | ; /* No change to wakeup settings */ |
1986 | else if (new_state == USB_STATE_CONFIGURED) | 1986 | else if (new_state == USB_STATE_CONFIGURED) |
1987 | wakeup = udev->actconfig->desc.bmAttributes | 1987 | wakeup = (udev->quirks & |
1988 | & USB_CONFIG_ATT_WAKEUP; | 1988 | USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 : |
1989 | udev->actconfig->desc.bmAttributes & | ||
1990 | USB_CONFIG_ATT_WAKEUP; | ||
1989 | else | 1991 | else |
1990 | wakeup = 0; | 1992 | wakeup = 0; |
1991 | } | 1993 | } |
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index a342a783d496..5ae883dc21f5 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
@@ -163,6 +163,10 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
163 | /* USB3503 */ | 163 | /* USB3503 */ |
164 | { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME }, | 164 | { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME }, |
165 | 165 | ||
166 | /* ASUS Base Station(T100) */ | ||
167 | { USB_DEVICE(0x0b05, 0x17e0), .driver_info = | ||
168 | USB_QUIRK_IGNORE_REMOTE_WAKEUP }, | ||
169 | |||
166 | { } /* terminating entry must be last */ | 170 | { } /* terminating entry must be last */ |
167 | }; | 171 | }; |
168 | 172 | ||