USB: serial: ftdi_sio: clean up jtag quirks

PATCH In review Johan Hovold 2 participants 2 messages Sep 29, 2020

Subsystems (2)

USB USB serial

lore

Share & tools

lore

Johan Hovold

author maintainer

2020-09-29 10:41 UTC #0 lore raw

PATCH 1/1 USB: serial: ftdi_sio: clean up jtag quirks

Drivers should not assume that interface descriptors have been parsed in any particular order so match on interface number instead when rejecting JTAG interfaces.

Also use the interface struct device for notifications so that the interface number is included.

Signed-off-by Johan Hovold <[email protected]>

---
 drivers/usb/serial/ftdi_sio.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

drivers/usb/serial/ftdi_sio.c +8 ~~-10~~

index 8d89a1650dad..12a4b74ca1f4 100644
@@ -2335,12 +2335,11 @@ static int ftdi_NDI_device_setup(struct usb_serial *serial)
  */
 static int ftdi_jtag_probe(struct usb_serial *serial)
 {
-	struct usb_device *udev = serial->dev;
-	struct usb_interface *interface = serial->interface;
+	struct usb_interface *intf = serial->interface;
+	int ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
 
-	if (interface == udev->actconfig->interface[0]) {
-		dev_info(&udev->dev,
-			 "Ignoring serial port reserved for JTAG\n");
+	if (ifnum == 0) {
+		dev_info(&intf->dev, "Ignoring interface reserved for JTAG\n");
 		return -ENODEV;
 	}

@@ -2372,12 +2371,11 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
  */
 static int ftdi_stmclite_probe(struct usb_serial *serial)
 {
-	struct usb_device *udev = serial->dev;
-	struct usb_interface *interface = serial->interface;
+	struct usb_interface *intf = serial->interface;
+	int ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
 
-	if (interface == udev->actconfig->interface[0] ||
-	    interface == udev->actconfig->interface[1]) {
-		dev_info(&udev->dev, "Ignoring serial port reserved for JTAG\n");
+	if (ifnum < 2) {
+		dev_info(&intf->dev, "Ignoring interface reserved for JTAG\n");
 		return -ENODEV;
 	}

Signature · 1 line

2.26.2

Greg KH

maintainer Reviewed-by on v1 1/1

2020-09-29 11:50 UTC #1 lore raw

Quoted 8 lines · Johan Hovold

Drivers should not assume that interface descriptors have been parsed in any particular order so match on interface number instead when rejecting JTAG interfaces.
Also use the interface struct device for notifications so that the interface number is included.
Signed-off-by Johan Hovold <[email protected]>

Reviewed-by Greg Kroah-Hartman <[email protected]>