USB: serial: ftdi_sio: rewrite 8u2232c quirk

Rewrite the 8u2232c quirk to avoid the manufacturer and product string
comparisons for the second port which will always be bound.

Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 05b3c558d1e2931060bf993855c375f2663d5cb4..3f224e3c3322f6238f0917d28f921fac4213ca55 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2302,16 +2302,21 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
 
 static int ftdi_8u2232c_probe(struct usb_serial *serial)
 {
+       struct usb_interface *intf = serial->interface;
        struct usb_device *udev = serial->dev;
+       int ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
 
-       if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems"))
-               return ftdi_jtag_probe(serial);
+       if (ifnum == 0) {
+               if (udev->manufacturer &&
+                               !strcmp(udev->manufacturer, "CALAO Systems"))
+                       return -ENODEV;
 
-       if (udev->product &&
-               (!strcmp(udev->product, "Arrow USB Blaster") ||
-                !strcmp(udev->product, "BeagleBone/XDS100V2") ||
-                !strcmp(udev->product, "SNAP Connect E10")))
-               return ftdi_jtag_probe(serial);
+               if (udev->product &&
+                               (!strcmp(udev->product, "Arrow USB Blaster") ||
+                                !strcmp(udev->product, "BeagleBone/XDS100V2") ||
+                                !strcmp(udev->product, "SNAP Connect E10")))
+                       return -ENODEV;
+       }
 
        return 0;
 }