aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-06-06 17:08:39 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-06 18:58:14 -0400
commitcdacb598fe7ab85de80908c818dd7d66a2971117 (patch)
tree5d600ae2feed41918356572ab4f4c64e84efd504 /drivers/usb
parenteab54042cd850778febae18098e77000dd298630 (diff)
option: add Zoom 4597 modem USB IDs
Uses Longcheer-based firmware and AT command set. Signed-off-by: Dan Williams <dcbw@redhat.com> Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/option.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 318dd00040a3..e39e7e8ba53a 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -379,6 +379,9 @@ static void option_instat_callback(struct urb *urb);
379 * It seems to contain a Qualcomm QSC6240/6290 chipset */ 379 * It seems to contain a Qualcomm QSC6240/6290 chipset */
380#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 380#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603
381 381
382/* Zoom */
383#define ZOOM_PRODUCT_4597 0x9607
384
382/* Haier products */ 385/* Haier products */
383#define HAIER_VENDOR_ID 0x201e 386#define HAIER_VENDOR_ID 0x201e
384#define HAIER_PRODUCT_CE100 0x2009 387#define HAIER_PRODUCT_CE100 0x2009
@@ -942,6 +945,7 @@ static const struct usb_device_id option_ids[] = {
942 { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), 945 { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
943 .driver_info = (kernel_ulong_t)&four_g_w14_blacklist 946 .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
944 }, 947 },
948 { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
945 { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) }, 949 { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
946 /* Pirelli */ 950 /* Pirelli */
947 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)}, 951 { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},