Skip to content

Commit 2596313

Browse files
committed
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
2 parents 342e495 + d3a8894 commit 2596313

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

drivers/usb/serial/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static int usb_serial_device_match(struct device *dev,
1717
const struct device_driver *drv)
1818
{
1919
const struct usb_serial_port *port = to_usb_serial_port(dev);
20-
struct usb_serial_driver *driver = to_usb_serial_driver(drv);
20+
const struct usb_serial_driver *driver = to_usb_serial_driver(drv);
2121

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

drivers/usb/serial/pl2303.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,8 @@ static int pl2303_detect_type(struct usb_serial *serial)
458458
case 0x605:
459459
case 0x700: /* GR */
460460
case 0x705:
461+
case 0x905: /* GT-2AB */
462+
case 0x1005: /* GC-Q20 */
461463
return TYPE_HXN;
462464
}
463465
break;

drivers/usb/serial/ti_usb_3410_5052.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -729,11 +729,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
729729

730730
/* start read urb */
731731
urb = port->read_urb;
732-
if (!urb) {
733-
dev_err(&port->dev, "%s - no read urb\n", __func__);
734-
status = -EINVAL;
735-
goto unlink_int_urb;
736-
}
737732
tport->tp_read_urb_state = TI_READ_URB_RUNNING;
738733
urb->context = tport;
739734
status = usb_submit_urb(urb, GFP_KERNEL);

0 commit comments

Comments
 (0)