diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2015-10-27 13:06:27 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:38:37 +0100 |
| commit | ce0c9313b7dd8b929c0c778f591a21dcf699a20b (patch) | |
| tree | 1a1f72206fe19dc82c7e85b549839c73fe61cad7 | |
| parent | f79bd0cc3bc2c6c09ffb684f120cb3c54316c812 (diff) | |
| download | linux-stable-ce0c9313b7dd8b929c0c778f591a21dcf699a20b.tar.gz linux-stable-ce0c9313b7dd8b929c0c778f591a21dcf699a20b.tar.bz2 linux-stable-ce0c9313b7dd8b929c0c778f591a21dcf699a20b.zip | |
Revert "USB: Add device quirk for ASUS T100 Base Station keyboard"
This reverts commit e25ecd21ffdbf1f8287103ccf97205fc30088344 in 3.12,
upstream commit ddbe1fca0bcb87ca8c199ea873a456ca8a948567 (USB: Add
device quirk for ASUS T100 Base Station keyboard).
It was applied twice to 3.12 and one backport is bogus.
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/usb/core/quirks.c | 4 | ||||
| -rw-r--r-- | include/linux/usb/quirks.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 7aa445de8413..08f321904fb7 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -207,10 +207,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 }, - { } /* terminating entry must be last */ }; diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h index 3fb428883460..a4abaeb3fb00 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -41,13 +41,10 @@ */ #define USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL 0x00000080 -/* 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 /* 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 - #endif /* __LINUX_USB_QUIRKS_H */ |