From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 29 Feb 2012 09:05:37 +0000 (+0100)
Subject: USB: ftdi_sio: add support for BeagleBone rev A5+
X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22^2~37
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=444aa7fa9bd752d19ce472d3e02558b987c3cc67;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

USB: ftdi_sio: add support for BeagleBone rev A5+

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>
---

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 989262606684..b160c252bf13 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -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;