Skip to content

Commit 4244149

Browse files
committed
Merge tag 'usb-serial-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.10-rc7 One more device ID for pl2303. Signed-off-by: Johan Hovold <[email protected]>
2 parents a3683e0 + d07830d commit 4244149

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/usb/serial/pl2303.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static const struct usb_device_id id_table[] = {
4949
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
5050
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
5151
{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
52+
{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID2) },
5253
{ USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) },
5354
{ USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
5455
{ USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) },

drivers/usb/serial/pl2303.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#define ATEN_VENDOR_ID 0x0557
2828
#define ATEN_VENDOR_ID2 0x0547
2929
#define ATEN_PRODUCT_ID 0x2008
30+
#define ATEN_PRODUCT_ID2 0x2118
3031

3132
#define IODATA_VENDOR_ID 0x04bb
3233
#define IODATA_PRODUCT_ID 0x0a03

0 commit comments

Comments
 (0)