diff options
| author | Michael Hennerich | 2009-09-14 16:39:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-23 15:46:16 +0200 |
| commit | 11eaf170363d264ff587f300e41c927ba5a33967 (patch) | |
| tree | fe0e08e4a8b42b706e035ae440560eedda5d9f7a /drivers/usb/serial/ftdi_sio.c | |
| parent | USB: sl811-hcd: Fix device disconnect: (diff) | |
| download | kernel-qcow2-linux-11eaf170363d264ff587f300e41c927ba5a33967.tar.gz kernel-qcow2-linux-11eaf170363d264ff587f300e41c927ba5a33967.tar.xz kernel-qcow2-linux-11eaf170363d264ff587f300e41c927ba5a33967.zip | |
USB: serial: ftdi: handle gnICE+ JTAG adaptors
Detect the UART on interface1 and blacklist interface0 (as that is the
JTAG port).
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 7c8eb53d88eb..4f883b1773d0 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -697,6 +697,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(DE_VID, WHT_PID) }, { USB_DEVICE(ADI_VID, ADI_GNICE_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |