diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-02-29 04:05:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-01 12:28:28 -0500 |
commit | 444aa7fa9bd752d19ce472d3e02558b987c3cc67 (patch) | |
tree | 966c414ad57fa1172a69bd9c3efc7332a5b9cb1b /drivers/usb/serial | |
parent | 7204cf584836c24b4b06e4ad4a8e6bb8ea84908e (diff) |
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>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
1769 | 1769 | ||
1770 | dbg("%s", __func__); | 1770 | dbg("%s", __func__); |
1771 | 1771 | ||
1772 | if ((udev->manufacturer) && | 1772 | if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || |
1773 | (strcmp(udev->manufacturer, "CALAO Systems") == 0)) | 1773 | (udev->product && !strcmp(udev->product, "BeagleBone/XDS100"))) |
1774 | return ftdi_jtag_probe(serial); | 1774 | return ftdi_jtag_probe(serial); |
1775 | 1775 | ||
1776 | return 0; | 1776 | return 0; |