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

Merge tag 'usb-serial-5.12-rc1' of... 

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

Johan writes:

USB-serial updates for 5.12-rc1

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

 - a line-speed fix for newer pl2303 devices
 - a line-speed fix for FTDI FT-X devices
 - a new xr_serial driver for MaxLinear/Exar devices (non-ACM mode)
 - a cdc-acm blacklist entry for when the xr_serial driver is enabled
 - cp210x support for software flow control
 - various cp210x modem-control fixes
 - an updated ZTE P685M modem entry to stop claiming the QMI interface
 - an update to drop the port_remove() driver-callback return value

Included are also various clean ups.

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

* tag 'usb-serial-5.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: (41 commits)
  USB: serial: drop bogus to_usb_serial_port() checks
  USB: serial: make remove callback return void
  USB: serial: drop if with an always false condition
  USB: serial: option: update interface mapping for ZTE P685M
  USB: serial: ftdi_sio: restore divisor-encoding comments
  USB: serial: ftdi_sio: fix FTX sub-integer prescaler
  USB: serial: cp210x: clean up auto-RTS handling
  USB: serial: cp210x: fix RTS handling
  USB: serial: cp210x: clean up printk zero padding
  USB: serial: cp210x: clean up flow-control debug message
  USB: serial: cp210x: drop shift macros
  USB: serial: cp210x: fix modem-control handling
  USB: serial: cp210x: suppress modem-control errors
  USB: serial: mos7720: fix error code in mos7720_write()
  USB: serial: xr: fix B0 handling
  USB: serial: xr: fix pin configuration
  USB: serial: xr: fix gpio-mode handling
  USB: serial: xr: simplify line-speed logic
  USB: serial: xr: clean up line-settings handling
  USB: serial: xr: document vendor-request recipient
  ...
parents 43861d29 1542d132

drivers/usb/class/cdc-acm.c

+6 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,12 @@ static const struct usb_device_id acm_ids[] = { 
	},

#endif



#if IS_ENABLED(CONFIG_USB_SERIAL_XR)

	{ USB_DEVICE(0x04e2, 0x1410),   /* Ignore XR21V141X USB to Serial converter */

	.driver_info = IGNORE_DEVICE,

	},

#endif



	/*Samsung phone in firmware update mode */

	{ USB_DEVICE(0x04e8, 0x685d),

	.driver_info = IGNORE_DEVICE,

drivers/usb/serial/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -633,6 +633,15 @@ config USB_SERIAL_UPD78F0730 
	  To compile this driver as a module, choose M here: the

	  module will be called upd78f0730.



config USB_SERIAL_XR

	tristate "USB MaxLinear/Exar USB to Serial driver"

	help

	  Say Y here if you want to use MaxLinear/Exar USB to Serial converter

	  devices.



	  To compile this driver as a module, choose M here: the

	  module will be called xr_serial.



config USB_SERIAL_DEBUG

	tristate "USB Debugging Device"

	help

drivers/usb/serial/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,4 +61,5 @@ obj-$(CONFIG_USB_SERIAL_UPD78F0730) += upd78f0730.o 
obj-$(CONFIG_USB_SERIAL_VISOR)			+= visor.o

obj-$(CONFIG_USB_SERIAL_WISHBONE)		+= wishbone-serial.o

obj-$(CONFIG_USB_SERIAL_WHITEHEAT)		+= whiteheat.o

obj-$(CONFIG_USB_SERIAL_XR)			+= xr_serial.o

obj-$(CONFIG_USB_SERIAL_XSENS_MT)		+= xsens_mt.o

drivers/usb/serial/ark3116.c

+1 −3
Original line number Diff line number Diff line
@@ -178,15 +178,13 @@ static int ark3116_port_probe(struct usb_serial_port *port) 
	return 0;

}



static int ark3116_port_remove(struct usb_serial_port *port)

static void ark3116_port_remove(struct usb_serial_port *port)

{

	struct ark3116_private *priv = usb_get_serial_port_data(port);



	/* device is closed, so URBs and DMA should be down */

	mutex_destroy(&priv->hw_lock);

	kfree(priv);



	return 0;

}



static void ark3116_set_termios(struct tty_struct *tty,

drivers/usb/serial/belkin_sa.c

+2 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


/* function prototypes for a Belkin USB Serial Adapter F5U103 */

static int belkin_sa_port_probe(struct usb_serial_port *port);

static int belkin_sa_port_remove(struct usb_serial_port *port);

static void belkin_sa_port_remove(struct usb_serial_port *port);

static int  belkin_sa_open(struct tty_struct *tty,

			struct usb_serial_port *port);

static void belkin_sa_close(struct usb_serial_port *port);
@@ -134,14 +134,12 @@ static int belkin_sa_port_probe(struct usb_serial_port *port) 
	return 0;

}



static int belkin_sa_port_remove(struct usb_serial_port *port)

static void belkin_sa_port_remove(struct usb_serial_port *port)

{

	struct belkin_sa_private *priv;



	priv = usb_get_serial_port_data(port);

	kfree(priv);



	return 0;

}



static int belkin_sa_open(struct tty_struct *tty,