Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'usb-serial-5.1-rc3' of... 

Merge tag 'usb-serial-5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for 5.1-rc3

Here's a fix for a long-standing refcount issue in the mos7720 parport
implementation, and a set of device id updates.

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

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Olicard 600
  USB: serial: cp210x: add new device id
  USB: serial: mos7720: fix mos_parport refcount imbalance on error path
  USB: serial: option: set driver_info for SIM5218 and compatibles
  USB: serial: ftdi_sio: add additional NovaTech products
  USB: serial: option: add support for Quectel EM12
parents 87be92b9 84f3b43f

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */

	{ USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */

	{ USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */

	{ USB_DEVICE(0x10C4, 0x8056) }, /* Lorenz Messtechnik devices */

	{ USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */

	{ USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */

	{ USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -609,6 +609,8 @@ static const struct usb_device_id id_table_combined[] = { 
		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+3 −1
Original line number Diff line number Diff line
@@ -568,6 +568,8 @@ 
 * NovaTech product ids (FTDI_VID)

 */

#define FTDI_NT_ORIONLXM_PID		0x7c90	/* OrionLXm Substation Automation Platform */

#define FTDI_NT_ORIONLX_PLUS_PID	0x7c91	/* OrionLX+ Substation Automation Platform */

#define FTDI_NT_ORION_IO_PID		0x7c92	/* Orion I/O */



/*

 * Synapse Wireless product ids (FTDI_VID)

drivers/usb/serial/mos7720.c

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,6 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport, 
	if (!urbtrack)

		return -ENOMEM;



	kref_get(&mos_parport->ref_count);

	urbtrack->mos_parport = mos_parport;

	urbtrack->urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!urbtrack->urb) {

		kfree(urbtrack);
@@ -388,6 +386,8 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport, 
			     usb_sndctrlpipe(usbdev, 0),

			     (unsigned char *)urbtrack->setup,

			     NULL, 0, async_complete, urbtrack);

	kref_get(&mos_parport->ref_count);

	urbtrack->mos_parport = mos_parport;

	kref_init(&urbtrack->ref_count);

	INIT_LIST_HEAD(&urbtrack->urblist_entry);

drivers/usb/serial/option.c

+12 −5
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ static void option_instat_callback(struct urb *urb); 
#define QUECTEL_PRODUCT_EC25			0x0125

#define QUECTEL_PRODUCT_BG96			0x0296

#define QUECTEL_PRODUCT_EP06			0x0306

#define QUECTEL_PRODUCT_EM12			0x0512



#define CMOTECH_VENDOR_ID			0x16d8

#define CMOTECH_PRODUCT_6001			0x6001
@@ -1066,7 +1067,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(3) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */

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

	/* Quectel products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
@@ -1087,6 +1089,9 @@ static const struct usb_device_id option_ids[] = { 
	{ 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) },

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

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

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

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
@@ -1943,6 +1948,8 @@ static const struct usb_device_id option_ids[] = { 
	{ 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 */

	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2031, 0xff),			/* Olicard 600 */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) },			/* OLICARD300 - MT6225 */

	{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },

	{ USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) },