diff options
| author | Milan Kocian <milon@wq.cz> | 2012-02-03 08:28:00 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 14:22:44 -0500 |
| commit | 90451e6973a5da155c6f315a409ca0a8d3ce6b76 (patch) | |
| tree | e0067d2ec68f0e2a981f19dca12b30f8d45763f1 | |
| parent | 8739348391c31a8d3759b10a52beaaf3fefa3b1f (diff) | |
USB: usbserial: add new PID number (0xa951) to the ftdi driver
Signed-off-by: Milan Kocian <milon@wq.cz>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index ad654f8208ef..f770415305f8 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -839,6 +839,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 839 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, | 839 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, |
| 840 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, | 840 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, |
| 841 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, | 841 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, |
| 842 | { USB_DEVICE(FTDI_VID, FTDI_CINTERION_MC55I_PID) }, | ||
| 842 | { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, | 843 | { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, |
| 843 | { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), | 844 | { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), |
| 844 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 845 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index f994503df2dd..6f6058f0db1b 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -1187,3 +1187,10 @@ | |||
| 1187 | */ | 1187 | */ |
| 1188 | /* ZigBee controller */ | 1188 | /* ZigBee controller */ |
| 1189 | #define FTDI_RF_R106 0x8A28 | 1189 | #define FTDI_RF_R106 0x8A28 |
| 1190 | |||
| 1191 | /* | ||
| 1192 | * Product: HCP HIT GPRS modem | ||
| 1193 | * Manufacturer: HCP d.o.o. | ||
| 1194 | * ATI command output: Cinterion MC55i | ||
| 1195 | */ | ||
| 1196 | #define FTDI_CINTERION_MC55I_PID 0xA951 | ||
