From: Peter Korsgaard Date: Wed, 29 Feb 2012 09:05:37 +0000 (+0100) Subject: USB: ftdi_sio: add support for BeagleBone rev A5+ X-Git-Tag: v3.0.27~102 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c2242dbfbf202a292875232c72d0ad445bcd391;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 264ed9a98254..dac9c720178c 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1755,8 +1755,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;