diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-26 22:31:33 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-26 22:31:33 +0400 |
| commit | 509633c8366a0df239297c89689e87aaf6625781 (patch) | |
| tree | 887622d77f0f2dc3886f52fdbe3f389df337dca1 /drivers/usb/class | |
| parent | bb748890d13232dba4a3975368bfeea6896368ae (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-509633c8366a0df239297c89689e87aaf6625781.tar.xz | |
Merge tag 'v3.13-rc4' into next/cleanup
Linux 3.13-rc4
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 3e7560f004f8..e8404319ca68 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1515,6 +1515,8 @@ static int acm_reset_resume(struct usb_interface *intf) static const struct usb_device_id acm_ids[] = { /* quirky and broken devices */ + { USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */ + .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, |