summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-04-27 09:38:51 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-05 11:15:40 -0700
commit16b8e683fa87f54926702dba0ba502a8c5ce5be2 (patch)
treecea9e9f15898b6041c9fa103f9f3bb976a342559 /drivers
parent8fba8f195b04bcb3a385b25ee0a09b5ab691af0b (diff)
downloadkernel-crypto-16b8e683fa87f54926702dba0ba502a8c5ce5be2.tar.gz
kernel-crypto-16b8e683fa87f54926702dba0ba502a8c5ce5be2.tar.xz
kernel-crypto-16b8e683fa87f54926702dba0ba502a8c5ce5be2.zip
USB: serial: option: add cinterion device id
commit 6f44bcb60bfa58590142545096b64f44144f0bc1 upstream. This adds a device id for a Cinterion device. Reported-by: John Race <John.Race@roscom.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/option.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 50b1fcd3152..99fd736dd79 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -364,6 +364,8 @@ static int option_resume(struct usb_serial *serial);
#define HAIER_VENDOR_ID 0x201e
#define HAIER_PRODUCT_CE100 0x2009
+#define CINTERION_VENDOR_ID 0x0681
+
static struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -859,6 +861,7 @@ static struct usb_device_id option_ids[] = {
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
+ { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, option_ids);