diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:06:53 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:06:53 -0700 |
| commit | 280330fac48280e16454cfa46c368af4812ad79c (patch) | |
| tree | 18b9ed796c57e3929e50b9b03f2c6501740b03d6 /drivers/usb/class/cdc-acm.c | |
| parent | d0d51a97063db4704a5ef6bc978dddab1636a306 (diff) | |
| parent | 4fe89d07dcc2804c8b562f6c7896a45643d34b2f (diff) | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 483bcb1213f7..cc637c4599e1 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1810,6 +1810,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */ .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */ }, + { USB_DEVICE(0x0c26, 0x0020), /* Icom ICF3400 Serie */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, { USB_DEVICE(0x0ca6, 0xa050), /* Castles VEGA3000 */ .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ }, |