diff options
| author | Tomasz Mloduchowski <q@qdot.me> | 2013-01-13 23:32:53 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:33 +0000 |
| commit | bc20c871bc118f719ada8f5771704c7cad7ef0e5 (patch) | |
| tree | 415bb6a9831dd9e804c894f15a9a155aaeef2d89 /drivers/usb/serial/ftdi_sio.c | |
| parent | eda0e8f5ced8fe3432abb9d1828b4145ecb30aac (diff) | |
| download | kernel_samsung_smdk4412-bc20c871bc118f719ada8f5771704c7cad7ef0e5.zip kernel_samsung_smdk4412-bc20c871bc118f719ada8f5771704c7cad7ef0e5.tar.gz kernel_samsung_smdk4412-bc20c871bc118f719ada8f5771704c7cad7ef0e5.tar.bz2 | |
usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added
commit 8cf65dc386f3634a43312f436cc7a935476a40c4 upstream.
Simple fix to add support for Crucible Technologies COMET Caller ID
USB decoder - a device containing FTDI USB/Serial converter chip,
handling 1200bps CallerID messages decoded from the phone line -
adding correct USB PID is sufficient.
Tested to apply cleanly and work flawlessly against 3.6.9, 3.7.0-rc8
and 3.8.0-rc3 on both amd64 and x86 arches.
Signed-off-by: Tomasz Mloduchowski <q@qdot.me>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 3f989d6..2cc7c18 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -881,6 +881,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) }, + /* Crucible Devices */ + { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ }; |