diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-02-29 10:05:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 10:31:32 -0700 |
| commit | 9aa7539973b0282e83319c4f388f1a2d47fe27dc (patch) | |
| tree | b41d0a6d731e36623555edfcc2f691acdd855a15 | |
| parent | f3d30caa9579a07abc37ba0faf6f16eefc887919 (diff) | |
USB: ftdi_sio: add support for BeagleBone rev A5+
commit 444aa7fa9bd752d19ce472d3e02558b987c3cc67 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 a80f51ad788..e776bd31696 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1763,8 +1763,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; |