UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB-serial updates for 5.19-rc1 

Here are the USB-serial updates for 5.19-rc1, including:
 
  - a workaround for pl2303 devices with unexpected bcdUSB
  - a new modem device id
 
 Included is also a printk clean up.
 
 All but the modem-id commit have been in linux-next with no reported
 issues.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQHbPq+cpGvN/peuzMLxc3C7H1lCAUCYoeFIAAKCRALxc3C7H1l
 CIXUAQDnSQdinW//FR1Xaatn0HK/PvgokH4deOOG6OEhSBQZCAD/ZEwOgGEn9Pws
 2h1JmHp8B0KOxJox2pyM8MEx8RzoiwE=
 =hU3t
 -----END PGP SIGNATURE-----

Merge tag 'usb-serial-5.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB-serial updates for 5.19-rc1

Here are the USB-serial updates for 5.19-rc1, including:

 - a workaround for pl2303 devices with unexpected bcdUSB
 - a new modem device id

Included is also a printk clean up.

All but the modem-id commit have been in linux-next with no reported
issues.

* tag 'usb-serial-5.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Quectel BG95 modem
  USB: serial: pl2303: fix type detection for odd device
  USB: serial: ftdi_sio: clean up printk format specifier
This commit is contained in:
Greg Kroah-Hartman 2022-05-20 21:14:44 +02:00
parent 859bdc3595 33b7af2f45
commit 8cfd16f722
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1671,7 +1671,7 @@ static ssize_t latency_timer_show(struct device *dev,
if (priv->flags & ASYNC_LOW_LATENCY)
return sprintf(buf, "1\n");
else
return sprintf(buf, "%i\n", priv->latency);
return sprintf(buf, "%u\n", priv->latency);
}
/* Write a new value of the latency timer, in units of milliseconds. */

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

@ -1137,6 +1137,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0xff, 0x30) }, /* EM160R-GL */
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0, 0) },
{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0700, 0xff), /* BG95 */
.driver_info = RSVD(3) | ZLP },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),

3
drivers/usb/serial/pl2303.c
View File

@ -420,6 +420,9 @@ static int pl2303_detect_type(struct usb_serial *serial)
bcdUSB = le16_to_cpu(desc->bcdUSB);
switch (bcdUSB) {
case 0x101:
/* USB 1.0.1? Let's assume they meant 1.1... */
fallthrough;
case 0x110:
switch (bcdDevice) {
case 0x300: