aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-04-27 12:38:51 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-30 12:25:11 -0400
commit6f44bcb60bfa58590142545096b64f44144f0bc1 (patch)
tree6efe615dd57c18ba90902a83b638ca24dcb2946e /drivers/usb
parentfe30bc1b16dcfbbadf3f77bbad1c9014b23704cd (diff)
USB: serial: option: add cinterion device id
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/usb')
-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 99e116c5e1bf..84d0edad8e4f 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -378,6 +378,8 @@ static int option_resume(struct usb_serial *serial);
378#define HAIER_VENDOR_ID 0x201e 378#define HAIER_VENDOR_ID 0x201e
379#define HAIER_PRODUCT_CE100 0x2009 379#define HAIER_PRODUCT_CE100 0x2009
380 380
381#define CINTERION_VENDOR_ID 0x0681
382
381/* some devices interfaces need special handling due to a number of reasons */ 383/* some devices interfaces need special handling due to a number of reasons */
382enum option_blacklist_reason { 384enum option_blacklist_reason {
383 OPTION_BLACKLIST_NONE = 0, 385 OPTION_BLACKLIST_NONE = 0,
@@ -723,6 +725,7 @@ static const struct usb_device_id option_ids[] = {
723 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)}, 725 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
724 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)}, 726 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
725 727
728 { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },
726 { } /* Terminating entry */ 729 { } /* Terminating entry */
727}; 730};
728MODULE_DEVICE_TABLE(usb, option_ids); 731MODULE_DEVICE_TABLE(usb, option_ids);