diff options
| author | Doug Goldstein | 2015-03-24 02:34:48 +0100 |
|---|---|---|
| committer | Johan Hovold | 2015-03-25 15:32:53 +0100 |
| commit | b229a0f840f774d29d8fedbf5deb344ca36b7f1a (patch) | |
| tree | becc7daaa92eccc3abffd5443a837251f5b5ff30 /drivers/usb/serial | |
| parent | USB: keyspan_pda: add new device id (diff) | |
| download | kernel-qcow2-linux-b229a0f840f774d29d8fedbf5deb344ca36b7f1a.tar.gz kernel-qcow2-linux-b229a0f840f774d29d8fedbf5deb344ca36b7f1a.tar.xz kernel-qcow2-linux-b229a0f840f774d29d8fedbf5deb344ca36b7f1a.zip | |
USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
This patch uses the existing CALAO Systems ftdi_8u2232c_probe in order
to avoid attaching a TTY to the JTAG port as this board is based on the
CALAO Systems reference design and needs the same fix up.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
CC: stable <stable@vger.kernel.org>
[johan: clean up probe logic ]
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 130b354a8fd7..8eb68a31cab6 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1884,8 +1884,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) { struct usb_device *udev = serial->dev; - if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || - (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2"))) + if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) + return ftdi_jtag_probe(serial); + + if (udev->product && + (!strcmp(udev->product, "BeagleBone/XDS100V2") || + !strcmp(udev->product, "SNAP Connect E10"))) return ftdi_jtag_probe(serial); return 0; |