openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB-serial fixes for v4.10-rc6 

Just a couple of new device ids.
 
 Signed-off-by: Johan Hovold <johan@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQIuBAABCAAYBQJYi1yzERxqb2hhbkBrZXJuZWwub3JnAAoJEEEN5E/e4bSVpz0Q
 AJJNVw3RflrHjSiDX5Sfti6Z5dlQ5jhwozHQsAXhJDTSB1NjsUSfhR8iGQvNs6Dr
 dwn5UYXghpZVZCWARua/N0H72up0GWqe1iomyqki80T9CPDg6GRkP88Dh5gfrEl7
 4mjeLjM13o4Mblx6GWF6KcXYYNWXd22f7rmAWiiOy5bAPIX9ZVtMoX8nsVRRrRsE
 y3zWdinn5G1q2Q7RR/c61vOcn6xZ8GMfiz8+15PiWS6mjS8NF+ZZow7guO6ZV7vI
 Xf6auBKF/hANhcycR1oUGSiz+se/qmAe03DIWOOxJHmd4B6HCoC5PJD5hw+bsril
 KXDBHr4mMapHDhrZyqltSubZn6Ab4RjZltWhT5gF4HP8Ngv6Y/utUVFcmp9t5Njg
 k+Rz9dMrKRDBnFeJsvbgGt65/Yw8+856Utt3HZ3T07sNTq4eMTwUB37ImOiCtNor
 n0HPXVZYn2gfMOZrf0U1EOCeBp+POmEctpi84aOgIb+/wESGDtWFVAinNUnKShHA
 +rrIEskvWHuQ7rRB1uCS6anunRqfRLrEyFeqlnXzEgtRP9MgKjjy+BPJ9wIjqe3z
 5okztbeeJLqGWEepQX4Rog6mU9bgTNxfTxDWm5nObsrH2HC++Wiik0T1UA+u+09x
 zdqDgtQabwXjr5ACXjwjOTCQoAuTr0MorAliGzwQ0sBk
 =m2iZ
 -----END PGP SIGNATURE-----

Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for v4.10-rc6

Just a couple of new device ids.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2017-01-27 16:01:52 +01:00
parent 83e526f2a2 5d03a2fd22
commit a3683e0c14
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/serial/option.c
View File

@ -2007,6 +2007,7 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD200, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_6802, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD300, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x421d, 0xff, 0xff, 0xff) }, /* HP lt2523 (Novatel E371) */
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, option_ids);

1
drivers/usb/serial/qcserial.c
View File

@ -124,6 +124,7 @@ static const struct usb_device_id id_table[] = {
{USB_DEVICE(0x1410, 0xa021)}, /* Novatel Gobi 3000 Composite */
{USB_DEVICE(0x413c, 0x8193)}, /* Dell Gobi 3000 QDL */
{USB_DEVICE(0x413c, 0x8194)}, /* Dell Gobi 3000 Composite */
{USB_DEVICE(0x413c, 0x81a6)}, /* Dell DW5570 QDL (MC8805) */
{USB_DEVICE(0x1199, 0x68a4)}, /* Sierra Wireless QDL */
{USB_DEVICE(0x1199, 0x68a5)}, /* Sierra Wireless Modem */
{USB_DEVICE(0x1199, 0x68a8)}, /* Sierra Wireless QDL */