USB: ftdi_sio: add support for BeagleBone rev A5+
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 29 Feb 2012 09:05:37 +0000 (10:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Mar 2012 17:28:28 +0000 (09:28 -0800)
BeagleBone changed to the default FTDI 0403:6010 id in rev A5 to make life
easier for Windows users, so we need a similar workaround as the Calao
board to support it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/ftdi_sio.c

index 9892626066849e8ddb3f4d465119aea98b2e1200..b160c252bf13fd83a45e534c922acce8a20397d3 100644 (file)
@@ -1769,8 +1769,8 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 
        dbg("%s", __func__);
 
-       if ((udev->manufacturer) &&
-           (strcmp(udev->manufacturer, "CALAO Systems") == 0))
+       if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
+           (udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
                return ftdi_jtag_probe(serial);
 
        return 0;