summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-06-06 23:08:39 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-07 00:58:14 +0200
commitcdacb598fe7ab85de80908c818dd7d66a2971117 (patch)
tree5d600ae2feed41918356572ab4f4c64e84efd504 /drivers/usb
parentMerge branch 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-cdacb598fe7ab85de80908c818dd7d66a2971117.tar.xz
linux-cdacb598fe7ab85de80908c818dd7d66a2971117.zip
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);
* It seems to contain a Qualcomm QSC6240/6290 chipset */
#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603
+/* Zoom */
+#define ZOOM_PRODUCT_4597 0x9607
+
/* Haier products */
#define HAIER_VENDOR_ID 0x201e
#define HAIER_PRODUCT_CE100 0x2009
@@ -942,6 +945,7 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
.driver_info = (kernel_ulong_t)&four_g_w14_blacklist
},
+ { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
/* Pirelli */
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},