summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorNathaniel Quillin <ndq@google.com>2016-12-05 17:53:00 +0300
committerSasha Levin <alexander.levin@verizon.com>2017-01-15 17:49:50 +0300
commit707d28d3fd998530cc13017ce0ef493e780ffe82 (patch)
treeb010cefed464b3a1b22010e7274439c40eb8fa75 /drivers/usb
parent6fe5845642c77a39519e177569791c8e05658e8c (diff)
downloadlinux-707d28d3fd998530cc13017ce0ef493e780ffe82.tar.xz
USB: cdc-acm: add device id for GW Instek AFG-125
[ Upstream commit 301216044e4c27d5a7323c1fa766266fad00db5e ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/usb')
-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 f88ee8f3373d..e2f63f5d30cb 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1727,6 +1727,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: */