diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:56 +0800 |
| commit | 0f7fc48d4378ac087ef7e69a6e675b0d9280999e (patch) | |
| tree | f0c005b00166eca0ce2648487cde89866447645f /drivers/usb/class/cdc-acm.c | |
| parent | 4fc0eccae84a29106ed944588ba641e9039ccfbc (diff) | |
| parent | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.03-androidlinux-linaro-lsk-v3.10-android
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index d2ea64de92df..d6dab8adf60e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1726,6 +1726,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, |