OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e877dd2
)
usb: add two quirky touchscreen
author
Oliver Neukum
<oneukum@suse.de>
Wed, 14 Aug 2013 09:01:46 +0000
(11:01 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 14 Aug 2013 19:49:27 +0000
(12:49 -0700)
These devices tend to become unresponsive after S3
Signed-off-by: Oliver Neukum <oneukum@suse.de>
CC: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/quirks.c
patch
|
blob
|
history
diff --git
a/drivers/usb/core/quirks.c
b/drivers/usb/core/quirks.c
index
a635988
..
5b44cd4
100644
(file)
--- a/
drivers/usb/core/quirks.c
+++ b/
drivers/usb/core/quirks.c
@@
-78,6
+78,12
@@
static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x04d8, 0x000c), .driver_info =
USB_QUIRK_CONFIG_INTF_STRINGS },
+ /* CarrolTouch 4000U */
+ { USB_DEVICE(0x04e7, 0x0009), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* CarrolTouch 4500U */
+ { USB_DEVICE(0x04e7, 0x0030), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* Samsung Android phone modem - ID conflict with SPH-I500 */
{ USB_DEVICE(0x04e8, 0x6601), .driver_info =
USB_QUIRK_CONFIG_INTF_STRINGS },