OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB-serial fixes for v4.13-rc4 

Here are some new device ids for v4.13-rc4.
 
 All have been in linux-next with no reported issues.
 
 Signed-off-by: Johan Hovold <johan@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEHszNKQClByu0A+9RQQ3kT97htJUFAlmDSXARHGpvaGFuQGtl
 cm5lbC5vcmcACgkQQQ3kT97htJWgoA/+LGO5SSJZTjGlqilC90idyoa1Ee1CtDCY
 Vuc/95wTFGcTs5i2QPt94/Pma8uxRsKI2zu1rFxef6jJjiSoRUsUaSjyJwaDkuEj
 YkeHUFcAzS8Gu+8U5Pz8DsB60Kw8pR+rS3VJsyOdBSUWLw/t6AVK3HagiejdqXXn
 L3lYbc8rohDFsj7UjdNd9Sgv5vS3pBRO1+lyAu0OqX8UpOUmndPdwbsmuQbcFDSE
 F/YI+oCxrbqLYma52buKBLNRmj5eF6QU0mjVJIfo1vFzx/zsGq64m7K7PVZ3F25H
 j354jmdONuuStqbLgRz3RkPHQK3ootQ7NEcyxYdN/Rs7bfWlnkfbMPK7LC9BCYwt
 w2Gx87nhBBiGLfP0GZ5qytwHCOYXVzxecwy4u1Byf4bt5w2J6CC1qYF1yUbK5Dxj
 jZUXA9Hd0bLHtlEldm5IcMlUeahseGHyYvH7OaXZXk/Uq4YhFH6vcTkuAQSJ0cTD
 KZgkfHymL/ukWORX5cZT6iU9M1pDdmDXpCz7h35FgaVEKNHmX62WX9SzgAyvCO3a
 lOSoVS//QyjaOSIboTm6a2NFE9YL4+5OTbooAj0qcU7vf5P3Lj2t3pm6sn2tpcvs
 YN6IzNbpWI8iGUUeRc88bT0ZSx6qf6B0kgmJQvnqn4z/fQOq1LfYgaPRxWVfXqGO
 K9rBZPH6svU=
 =bRO0
 -----END PGP SIGNATURE-----

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

Johan writes:

USB-serial fixes for v4.13-rc4

Here are some new device ids for v4.13-rc4.

All have been in linux-next with no reported issues.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2017-08-03 09:51:02 -07:00
parent 2326744159 fd1b8668af
commit 8cc34c8d61
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
{ USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
{ USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */

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

@ -2025,6 +2025,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */