diff options
| author | Zefan Li <lizefan@huawei.com> | 2016-10-09 19:20:47 +0800 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:44 +0800 |
| commit | 7862b8a351bb72b45307123993b2991374869765 (patch) | |
| tree | 2e78f60d9eb52ac478e6384de8fdb4e4cd45adbb | |
| parent | d64519bf05760fc4f2d9a31e28df56af873c5b65 (diff) | |
| download | linux-stable-7862b8a351bb72b45307123993b2991374869765.tar.gz linux-stable-7862b8a351bb72b45307123993b2991374869765.tar.bz2 linux-stable-7862b8a351bb72b45307123993b2991374869765.zip | |
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>
| -rw-r--r-- | drivers/usb/core/hub.c | 6 | ||||
| -rw-r--r-- | drivers/usb/core/quirks.c | 4 | ||||
| -rw-r--r-- | include/linux/usb/quirks.h | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index e0ad5dc214b3..65ff69a05225 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1655,10 +1655,8 @@ 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->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; } diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index fd8e60ee7df2..32e08dcc4354 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -184,10 +184,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = { { 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 }, diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h index 0972470bb072..a67e7d13008b 100644 --- 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 |