diff options
| author | Linus Torvalds <[email protected]> | 2014-03-02 23:15:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-03-02 23:15:07 +0000 |
| commit | a53c8ceb01c5ae29ae26ab1f97d53018b2021a29 (patch) | |
| tree | e7c44300f589caff9e1f53b9d6693797c0c7cb6b /drivers/usb/serial/ftdi_sio.c | |
| parent | Merge tag 'driver-core-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | usb: ehci: fix deadlock when threadirqs option is used (diff) | |
| download | kernel-a53c8ceb01c5ae29ae26ab1f97d53018b2021a29.tar.gz kernel-a53c8ceb01c5ae29ae26ab1f97d53018b2021a29.zip | |
Merge tag 'usb-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are 2 USB patches for 3.14-rc5, one a new device id, and the
other fixes a reported problem with threaded irqs and the USB EHCI
driver"
* tag 'usb-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: ehci: fix deadlock when threadirqs option is used
USB: ftdi_sio: add Cressi Leonardo PID
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 ee1f00f03c43..44ab12986805 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -907,6 +907,8 @@ static const struct usb_device_id id_table_combined[] = { /* Crucible Devices */ { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) }, + /* Cressi Devices */ + { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) }, { } /* Terminating entry */ }; |