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

Merge tag 'usb-serial-5.13-rc5' of... 

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

Jonah writes:

USB-serial fixes for 5.13-rc5

Here's a fix for some pipe-direction mismatches in the quatech2 driver,
and a couple of new device ids for ftdi_sio and omninet (and a related
trivial cleanup).

All but the ftdi_sio commit have been in linux-next, and with no
reported issues.

* tag 'usb-serial-5.13-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: add NovaTech OrionMX product ID
  USB: serial: omninet: update driver description
  USB: serial: omninet: add device id for Zyxel Omni 56K Plus
  USB: serial: quatech2: fix control-request directions
parents 6fc1db5e bc96c72d

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static const struct usb_device_id id_table_combined[] = { 
		.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_NT_ORIONMX_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

+1 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ 
#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 */

#define FTDI_NT_ORIONMX_PID		0x7c93	/* OrionMX */



/*

 * Synapse Wireless product ids (FTDI_VID)

drivers/usb/serial/omninet.c

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * USB ZyXEL omni.net LCD PLUS driver

 * USB ZyXEL omni.net driver

 *

 * Copyright (C) 2013,2017 Johan Hovold <johan@kernel.org>

 *
@@ -22,10 +22,11 @@ 
#include <linux/usb/serial.h>



#define DRIVER_AUTHOR "Alessandro Zummo"

#define DRIVER_DESC "USB ZyXEL omni.net LCD PLUS Driver"

#define DRIVER_DESC "USB ZyXEL omni.net Driver"



#define ZYXEL_VENDOR_ID		0x0586

#define ZYXEL_OMNINET_ID	0x1000

#define ZYXEL_OMNI_56K_PLUS_ID	0x1500

/* This one seems to be a re-branded ZyXEL device */

#define BT_IGNITIONPRO_ID	0x2000
@@ -40,6 +41,7 @@ static void omninet_port_remove(struct usb_serial_port *port); 


static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNINET_ID) },

	{ USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNI_56K_PLUS_ID) },

	{ USB_DEVICE(ZYXEL_VENDOR_ID, BT_IGNITIONPRO_ID) },

	{ }						/* Terminating entry */

};
@@ -50,7 +52,7 @@ static struct usb_serial_driver zyxel_omninet_device = { 
		.owner =	THIS_MODULE,

		.name =		"omninet",

	},

	.description =		"ZyXEL - omni.net lcd plus usb",

	.description =		"ZyXEL - omni.net usb",

	.id_table =		id_table,

	.num_bulk_out =		2,

	.calc_num_ports =	omninet_calc_num_ports,

drivers/usb/serial/quatech2.c

+3 −3
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void qt2_close(struct usb_serial_port *port) 


	/* flush the port transmit buffer */

	i = usb_control_msg(serial->dev,

			    usb_rcvctrlpipe(serial->dev, 0),

			    usb_sndctrlpipe(serial->dev, 0),

			    QT2_FLUSH_DEVICE, 0x40, 1,

			    port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
@@ -426,7 +426,7 @@ static void qt2_close(struct usb_serial_port *port) 


	/* flush the port receive buffer */

	i = usb_control_msg(serial->dev,

			    usb_rcvctrlpipe(serial->dev, 0),

			    usb_sndctrlpipe(serial->dev, 0),

			    QT2_FLUSH_DEVICE, 0x40, 0,

			    port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
@@ -639,7 +639,7 @@ static int qt2_attach(struct usb_serial *serial) 
	int status;



	/* power on unit */

	status = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),

	status = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),

				 0xc2, 0x40, 0x8000, 0, NULL, 0,

				 QT2_USB_TIMEOUT);

	if (status < 0) {