summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2016-01-18 15:45:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-25 06:06:21 +0100
commite912e685f372ab62a2405a1acd923597f524e94a (patch)
treef7e3ef585a41a00b0a2ff699fd37594f254329b6 /drivers/usb/class
parentusb: cdc-acm: send zero packet for intel 7260 modem (diff)
downloadlinux-e912e685f372ab62a2405a1acd923597f524e94a.tar.xz
linux-e912e685f372ab62a2405a1acd923597f524e94a.zip
cdc-acm:exclude Samsung phone 04e8:685d
This phone needs to be handled by a specialised firmware tool and is reported to crash irrevocably if cdc-acm takes it. Signed-off-by: Oliver Neukum <oneukum@suse.com> CC: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r--drivers/usb/class/cdc-acm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e4c70dce3e7c..fa4e23930614 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1841,6 +1841,11 @@ static const struct usb_device_id acm_ids[] = {
},
#endif
+ /*Samsung phone in firmware update mode */
+ { USB_DEVICE(0x04e8, 0x685d),
+ .driver_info = IGNORE_DEVICE,
+ },
+
/* Exclude Infineon Flash Loader utility */
{ USB_DEVICE(0x058b, 0x0041),
.driver_info = IGNORE_DEVICE,