| From d3c9cefbd27122111214925e4bf10293a19563ea Mon Sep 17 00:00:00 2001 |
| From: Zefan Li <lizefan@huawei.com> |
| Date: Sun, 9 Oct 2016 19:20:47 +0800 |
| Subject: [PATCH 3/4] Revert "USB: Add device quirk for ASUS T100 Base Station |
| keyboard" |
| |
| This reverts commit eea5a87d270e8d6925063019c3b0f3ff61fcb49a. |
| |
| Conflicts: |
| drivers/usb/core/quirks.c |
| include/linux/usb/quirks.h |
| |
| Signed-off-by: Zefan Li <lizefan@huawei.com> |
| --- |
| drivers/usb/core/hub.c | 6 ++---- |
| drivers/usb/core/quirks.c | 4 ---- |
| include/linux/usb/quirks.h | 3 --- |
| 3 files changed, 2 insertions(+), 11 deletions(-) |
| |
| --- a/drivers/usb/core/hub.c |
| +++ b/drivers/usb/core/hub.c |
| @@ -1655,10 +1655,8 @@ void usb_set_device_state(struct usb_dev |
| || new_state == USB_STATE_SUSPENDED) |
| ; /* No change to wakeup settings */ |
| else if (new_state == USB_STATE_CONFIGURED) |
| - wakeup = (udev->quirks & |
| - USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 : |
| - udev->actconfig->desc.bmAttributes & |
| - USB_CONFIG_ATT_WAKEUP; |
| + wakeup = udev->actconfig->desc.bmAttributes |
| + & USB_CONFIG_ATT_WAKEUP; |
| else |
| wakeup = 0; |
| } |
| --- a/drivers/usb/core/quirks.c |
| +++ b/drivers/usb/core/quirks.c |
| @@ -184,10 +184,6 @@ static const struct usb_device_id usb_in |
| { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), |
| .driver_info = USB_QUIRK_RESET_RESUME }, |
| |
| - /* ASUS Base Station(T100) */ |
| - { USB_DEVICE(0x0b05, 0x17e0), .driver_info = |
| - USB_QUIRK_IGNORE_REMOTE_WAKEUP }, |
| - |
| /* Protocol and OTG Electrical Test Device */ |
| { USB_DEVICE(0x1a0a, 0x0200), .driver_info = |
| USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, |
| --- a/include/linux/usb/quirks.h |
| +++ b/include/linux/usb/quirks.h |
| @@ -30,9 +30,6 @@ |
| descriptor */ |
| #define USB_QUIRK_DELAY_INIT 0x00000040 |
| |
| -/* device generates spurious wakeup, ignore remote wakeup capability */ |
| -#define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200 |
| - |
| /* device can't handle device_qualifier descriptor requests */ |
| #define USB_QUIRK_DEVICE_QUALIFIER 0x00000100 |
| |