3.4-stable patches

added patches:
	usb-serial-option-add-support-for-inovia-sew858-device.patch
	usb-serial-option-blacklist-olivetti-olicard200.patch
	usb-serial-ti_usb_3410_5052-add-abbott-strip-port-id-to-combined-table-as-well.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index 7711e6fbb583497574cc38b2d2988547ce7c57d8..aa4af1703dafe783cdabdca771ebb34878ac76ca 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -27,3 +27,6 @@ ext3-return-32-64-bit-dir-name-hash-according-to-usage-type.patch
 dm-snapshot-fix-data-corruption.patch
 writeback-fix-negative-bdi-max-pause.patch
 wireless-radiotap-fix-parsing-buffer-overrun.patch
+usb-serial-ti_usb_3410_5052-add-abbott-strip-port-id-to-combined-table-as-well.patch
+usb-serial-option-add-support-for-inovia-sew858-device.patch
+usb-serial-option-blacklist-olivetti-olicard200.patch

diff --git a/queue-3.4/usb-serial-option-add-support-for-inovia-sew858-device.patch b/queue-3.4/usb-serial-option-add-support-for-inovia-sew858-device.patch
new file mode 100644 (file)
index 0000000..cecd237
--- /dev/null
+++ b/queue-3.4/usb-serial-option-add-support-for-inovia-sew858-device.patch
@@ -0,0 +1,40 @@
+From f4c19b8e165cff1a6607c21f8809441d61cab7ec Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 5 Oct 2013 18:14:18 -0700
+Subject: USB: serial: option: add support for Inovia SEW858 device
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit f4c19b8e165cff1a6607c21f8809441d61cab7ec upstream.
+
+This patch adds the device id for the Inovia SEW858 device to the option driver.
+
+Reported-by: Pavel Parkhomenko <ra85551@gmail.com>
+Tested-by: Pavel Parkhomenko <ra85551@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/option.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -457,6 +457,10 @@ static void option_instat_callback(struc
+ #define CHANGHONG_VENDOR_ID                   0x2077
+ #define CHANGHONG_PRODUCT_CH690                       0x7001
+ 
++/* Inovia */
++#define INOVIA_VENDOR_ID                      0x20a6
++#define INOVIA_SEW858                         0x1105
++
+ /* some devices interfaces need special handling due to a number of reasons */
+ enum option_blacklist_reason {
+               OPTION_BLACKLIST_NONE = 0,
+@@ -1367,6 +1371,7 @@ static const struct usb_device_id option
+       { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+       { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
+       { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
++      { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
+       { } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, option_ids);

diff --git a/queue-3.4/usb-serial-option-blacklist-olivetti-olicard200.patch b/queue-3.4/usb-serial-option-blacklist-olivetti-olicard200.patch
new file mode 100644 (file)
index 0000000..6e82c7b
--- /dev/null
+++ b/queue-3.4/usb-serial-option-blacklist-olivetti-olicard200.patch
@@ -0,0 +1,34 @@
+From fd8573f5828873343903215f203f14dc82de397c Mon Sep 17 00:00:00 2001
+From: Enrico Mioso <mrkiko.rs@gmail.com>
+Date: Tue, 15 Oct 2013 15:06:47 +0200
+Subject: usb: serial: option: blacklist Olivetti Olicard200
+
+From: Enrico Mioso <mrkiko.rs@gmail.com>
+
+commit fd8573f5828873343903215f203f14dc82de397c upstream.
+
+Interface 6 of this device speaks QMI as per tests done by us.
+Credits go to Antonella for providing the hardware.
+
+Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com>
+Signed-off-by: Antonella Pellizzari <anto.pellizzari83@gmail.com>
+Tested-by: Dan Williams <dcbw@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/option.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -1283,7 +1283,9 @@ static const struct usb_device_id option
+ 
+       { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
+       { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
+-      { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) },
++      { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
++              .driver_info = (kernel_ulong_t)&net_intf6_blacklist
++      },
+       { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
+       { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
+       { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },

diff --git a/queue-3.4/usb-serial-ti_usb_3410_5052-add-abbott-strip-port-id-to-combined-table-as-well.patch b/queue-3.4/usb-serial-ti_usb_3410_5052-add-abbott-strip-port-id-to-combined-table-as-well.patch
new file mode 100644 (file)
index 0000000..91b0d49
--- /dev/null
+++ b/queue-3.4/usb-serial-ti_usb_3410_5052-add-abbott-strip-port-id-to-combined-table-as-well.patch
@@ -0,0 +1,29 @@
+From c9d09dc7ad106492c17c587b6eeb99fe3f43e522 Mon Sep 17 00:00:00 2001
+From: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+Date: Tue, 8 Oct 2013 20:03:37 +0100
+Subject: USB: serial: ti_usb_3410_5052: add Abbott strip port ID to combined table as well.
+
+From: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+
+commit c9d09dc7ad106492c17c587b6eeb99fe3f43e522 upstream.
+
+Without this change, the USB cable for Freestyle Option and compatible
+glucometers will not be detected by the driver.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/ti_usb_3410_5052.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/serial/ti_usb_3410_5052.c
++++ b/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -210,6 +210,7 @@ static struct usb_device_id ti_id_table_
+       { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
+       { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
+       { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
++      { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
+       { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
+       { }
+ };