summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2016-01-18 15:45:18 +0100
committerSasha Levin <sasha.levin@oracle.com>2016-02-15 15:45:20 -0500
commit08d717c38d856465804b1b1d3fea19b64d8214e7 (patch)
treed5de2da39c58222f493c968a911af69e254e4f39 /drivers
parenta7b1bf8b60e4fd4deb414cabc9f218eff244d4f9 (diff)
downloadlwn-08d717c38d856465804b1b1d3fea19b64d8214e7.tar.gz
lwn-08d717c38d856465804b1b1d3fea19b64d8214e7.zip
cdc-acm:exclude Samsung phone 04e8:685d
[ Upstream commit e912e685f372ab62a2405a1acd923597f524e94a ] 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> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
-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 8bfcf208c619..df3deb000a80 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1851,6 +1851,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,