Commit b48a7e75 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.10-rc7' of... 

Merge tag 'usb-serial-5.10-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for 5.10-rc7

Here's a fix for a regression in the option driver which has been
backported to the stable trees and fix for a small memory leak on open
in the kl5kusb105 driver.

Included are also various new device ids.

All but the memleak fix has been in linux-next and with no reported
issues.

* tag 'usb-serial-5.10-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: kl5kusb105: fix memleak on open
  USB: serial: ch341: sort device-id entries
  USB: serial: ch341: add new Product ID for CH341A
  USB: serial: option: fix Quectel BG96 matching
  USB: serial: option: add support for Thales Cinterion EXS82
  USB: serial: option: add Fibocom NL668 variants
parents d3f31301 3f203f05

drivers/usb/serial/ch341.c

+3 −2
Original line number Diff line number Diff line
@@ -81,10 +81,11 @@ 
#define CH341_QUIRK_SIMULATE_BREAK	BIT(1)



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x4348, 0x5523) },

	{ USB_DEVICE(0x1a86, 0x5512) },

	{ USB_DEVICE(0x1a86, 0x5523) },

	{ USB_DEVICE(0x1a86, 0x7522) },

	{ USB_DEVICE(0x1a86, 0x7523) },

	{ USB_DEVICE(0x1a86, 0x5523) },

	{ USB_DEVICE(0x4348, 0x5523) },

	{ },

};

MODULE_DEVICE_TABLE(usb, id_table);

drivers/usb/serial/kl5kusb105.c

+4 −6
Original line number Diff line number Diff line
@@ -276,12 +276,12 @@ static int klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port) 
	priv->cfg.unknown2 = cfg->unknown2;

	spin_unlock_irqrestore(&priv->lock, flags);



	kfree(cfg);



	/* READ_ON and urb submission */

	rc = usb_serial_generic_open(tty, port);

	if (rc) {

		retval = rc;

		goto err_free_cfg;

	}

	if (rc)

		return rc;



	rc = usb_control_msg(port->serial->dev,

			     usb_sndctrlpipe(port->serial->dev, 0),
@@ -324,8 +324,6 @@ err_disable_read: 
			     KLSI_TIMEOUT);

err_generic_close:

	usb_serial_generic_close(port);

err_free_cfg:

	kfree(cfg);



	return retval;

}

drivers/usb/serial/option.c

+6 −4
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ static void option_instat_callback(struct urb *urb); 
#define CINTERION_PRODUCT_PH8			0x0053

#define CINTERION_PRODUCT_AHXX			0x0055

#define CINTERION_PRODUCT_PLXX			0x0060

#define CINTERION_PRODUCT_EXS82			0x006c

#define CINTERION_PRODUCT_PH8_2RMNET		0x0082

#define CINTERION_PRODUCT_PH8_AUDIO		0x0083

#define CINTERION_PRODUCT_AHXX_2RMNET		0x0084
@@ -1105,9 +1106,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0, 0) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
@@ -1902,6 +1902,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff),

	  .driver_info = RSVD(0) | RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EXS82, 0xff) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
@@ -2046,12 +2047,13 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE(0x0489, 0xe0b5),						/* Foxconn T77W968 ESIM */

	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 */

	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 (IOT version) */

	  .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },

	{ USB_DEVICE(0x2cb7, 0x0104),						/* Fibocom NL678 series */

	  .driver_info = RSVD(4) | RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff),			/* Fibocom NL678 series */

	  .driver_info = RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) },			/* GosunCn GM500 RNDIS */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) },			/* GosunCn GM500 MBIM */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */

CRA Git | Maintained and supported by SUSTech CRA and CCSE