diff options
| author | Johan Hovold <johan@kernel.org> | 2014-08-25 17:51:26 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-14 15:19:57 +0000 |
| commit | 41097a382019cfddfc810a79b3739ea1eb2937bb (patch) | |
| tree | fc8c6d69616b59c03bedf04ab659a4dce10d8c78 | |
| parent | 785c933887e0202f41269f417e9e1960d3cb58fd (diff) | |
USB: core: add device-qualifier quirk
commit 2a159389bf5d962359349a76827b2f683276a1c7 upstream.
Add new quirk for devices that cannot handle requests for the
device_qualifier descriptor.
A USB-2.0 compliant device must respond to requests for the
device_qualifier descriptor (even if it's with a request error), but at
least one device is known to misbehave after such a request.
Suggested-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[ luis: prereq for the following Elan touchscreen patches ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/usb/core/hub.c | 3 | ||||
| -rw-r--r-- | include/linux/usb/quirks.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index ba2a8f3b8059..0e0e0354c523 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -4524,6 +4524,9 @@ check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1) struct usb_qualifier_descriptor *qual; int status; + if (udev->quirks & USB_QUIRK_DEVICE_QUALIFIER) + return; + qual = kmalloc (sizeof *qual, GFP_KERNEL); if (qual == NULL) return; diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h index 49587dc22f5d..8b96ae2a38fe 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -33,4 +33,7 @@ /* 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 */ |