summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorNathaniel Quillin <ndq@google.com>2016-12-05 06:53:00 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-12-05 16:32:51 +0100
commit301216044e4c27d5a7323c1fa766266fad00db5e (patch)
tree48a3beb4114e28bc3f98e0505f9621e4c413f406 /drivers/usb/class
parent9d4b82706357f2eb23f45309227fc94d11eea255 (diff)
downloadblackbird-op-linux-301216044e4c27d5a7323c1fa766266fad00db5e.tar.gz
blackbird-op-linux-301216044e4c27d5a7323c1fa766266fad00db5e.zip
USB: cdc-acm: add device id for GW Instek AFG-125
Add device-id entry for GW Instek AFG-125, which has a byte swapped bInterfaceSubClass (0x20). Signed-off-by: Nathaniel Quillin <ndq@google.com> Acked-by: Oliver Neukum <oneukum@suse.com> Cc: stable <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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index d053075a8444..e35b1508d3eb 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1732,6 +1732,7 @@ static const struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */
.driver_info = QUIRK_CONTROL_LINE_STATE, },
{ USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */
+ { USB_DEVICE(0x2184, 0x0036) }, /* GW Instek AFG-125 */
{ USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */
},
/* Motorola H24 HSPA module: */
OpenPOWER on IntegriCloud