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

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

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

Johan writes:

USB serial updates for 6.16-rc1

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

 - fix of an incorrect const cast
 - removal of a bogus read urb sanity check
 - support for a couple of new pl2303 device types

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

* tag 'usb-serial-6.16-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: pl2303: add new chip PL2303GC-Q20 and PL2303GT-2AB
  USB: serial: bus: fix const issue in usb_serial_device_match()
  USB: serial: ti_usb_3410_5052: drop bogus read urb check
parents 342e4955 d3a88948

drivers/usb/serial/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static int usb_serial_device_match(struct device *dev, 
				   const struct device_driver *drv)

{

	const struct usb_serial_port *port = to_usb_serial_port(dev);

	struct usb_serial_driver *driver = to_usb_serial_driver(drv);

	const struct usb_serial_driver *driver = to_usb_serial_driver(drv);



	/*

	 * drivers are already assigned to ports in serial_probe so it's

drivers/usb/serial/pl2303.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ static int pl2303_detect_type(struct usb_serial *serial) 
		case 0x605:

		case 0x700:	/* GR */

		case 0x705:

		case 0x905:	/* GT-2AB */

		case 0x1005:	/* GC-Q20 */

			return TYPE_HXN;

		}

		break;

drivers/usb/serial/ti_usb_3410_5052.c

+0 −5
Original line number Diff line number Diff line
@@ -729,11 +729,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port) 


	/* start read urb */

	urb = port->read_urb;

	if (!urb) {

		dev_err(&port->dev, "%s - no read urb\n", __func__);

		status = -EINVAL;

		goto unlink_int_urb;

	}

	tport->tp_read_urb_state = TI_READ_URB_RUNNING;

	urb->context = tport;

	status = usb_submit_urb(urb, GFP_KERNEL);