2.6.34-rc7 option.c: support for olicard100 + zte636-0x0037

[Nils Radtke]

  Hi,

  using the attached patch to get the olicard100 umts-stick working. W/o success.
  No change in behaviour when trying to dial up.

  I noticed that I missed a device, no 4, in the blacklist. Re-testing soon.

  Cheers,

  Nils


Index: linux-2.6.34-rc7/drivers/usb/serial/option.c
===================================================================
--- linux-2.6.34-rc7.orig/drivers/usb/serial/option.c	2010-05-10 20:56:37.000000000 +0200
+++ linux-2.6.34-rc7/drivers/usb/serial/option.c	2010-05-10 21:00:59.000000000 +0200
@@ -302,6 +302,7 @@
 #define ZTE_PRODUCT_MF622			0x0001
 #define ZTE_PRODUCT_MF628			0x0015
 #define ZTE_PRODUCT_MF626			0x0031
+#define ZTE_PRODUCT_MF636			0x0037
 #define ZTE_PRODUCT_CDMA_TECH			0xfffe
 #define ZTE_PRODUCT_AC8710			0xfff1
 #define ZTE_PRODUCT_AC2726			0xfff5
@@ -378,6 +379,10 @@
 #define HAIER_VENDOR_ID				0x201e
 #define HAIER_PRODUCT_CE100			0x2009
 
+/* Olivetti products */
+#define OLIVETTI_VENDOR_ID				0x0b3c
+#define OLIVETTI_PRODUCT_OLICARD100			0xc000
+
 #define CINTERION_VENDOR_ID			0x0681
 
 /* some devices interfaces need special handling due to a number of reasons */
@@ -400,6 +405,13 @@
 	.reason = OPTION_BLACKLIST_SENDSETUP
 };
 
+static const u8 olivetti_olicard100_no_sendsetup[] = { 1, 3 };
+static const struct option_blacklist_info olivetti_olicard100_blacklist = {
+	.infolen = ARRAY_SIZE(olivetti_olicard100_no_sendsetup),
+	.ifaceinfo = olivetti_olicard100_no_sendsetup,
+	.reason = OPTION_BLACKLIST_SENDSETUP
+};
+
 static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -617,7 +629,7 @@
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF636, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
@@ -707,6 +719,9 @@
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
   	},
 	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
+	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
+  	  .driver_info = (kernel_ulong_t)&olivetti_olicard100_blacklist
+    },
 	/* Pirelli  */
 	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},
 	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_2)},

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/