From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 8 Jul 2017 08:42:25 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v4.9.37~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf27c516874f3a83f921e0a3343730014849161a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	usb-serial-option-add-two-longcheer-device-ids.patch
	usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
---

diff --git a/queue-3.18/series b/queue-3.18/series
index 96605764481..baabc6e419f 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -12,3 +12,5 @@ usb-usbip-set-buffer-pointers-to-null-after-free.patch
 usb-fix-typo-in-the-definition-of-endpointrequest.patch
 pinctrl-mxs-atomically-switch-mux-and-drive-strength-config.patch
 pinctrl-sh-pfc-update-info-pointer-after-soc-specific-init.patch
+usb-serial-option-add-two-longcheer-device-ids.patch
+usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
diff --git a/queue-3.18/usb-serial-option-add-two-longcheer-device-ids.patch b/queue-3.18/usb-serial-option-add-two-longcheer-device-ids.patch
new file mode 100644
index 00000000000..bdfba8a4520
--- /dev/null
+++ b/queue-3.18/usb-serial-option-add-two-longcheer-device-ids.patch
@@ -0,0 +1,39 @@
+From 8fb060da715ad10fe956d7c0077b2fb0c12bb9d7 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan@kernel.org>
+Date: Mon, 12 Jun 2017 16:30:16 +0200
+Subject: USB: serial: option: add two Longcheer device ids
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Johan Hovold <johan@kernel.org>
+
+commit 8fb060da715ad10fe956d7c0077b2fb0c12bb9d7 upstream.
+
+Add two Longcheer device-id entries which specifically enables a
+Telewell TW-3G HSPA+ branded modem (0x9801).
+
+Reported-by: Teemu Likonen <tlikonen@iki.fi>
+Reported-by: Bjørn Mork <bjorn@mork.no>
+Reported-by: Lars Melin <larsm17@gmail.com>
+Tested-by: Teemu Likonen <tlikonen@iki.fi>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/option.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -1872,6 +1872,10 @@ static const struct usb_device_id option
+   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
+   	},
+ 	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
++	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),
++	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
++	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),
++	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+ 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
+ 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
+ 	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
diff --git a/queue-3.18/usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch b/queue-3.18/usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
new file mode 100644
index 00000000000..305132af021
--- /dev/null
+++ b/queue-3.18/usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
@@ -0,0 +1,33 @@
+From 996fab55d864ed604158f71724ff52db1c2454a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
+Date: Tue, 13 Jun 2017 19:11:42 +0200
+Subject: USB: serial: qcserial: new Sierra Wireless EM7305 device ID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit 996fab55d864ed604158f71724ff52db1c2454a3 upstream.
+
+A new Sierra Wireless EM7305 device ID used in a Toshiba laptop.
+
+Reported-by: Petr Kloc <petr_kloc@yahoo.com>
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -152,6 +152,7 @@ static const struct usb_device_id id_tab
+ 	{DEVICE_SWI(0x1199, 0x9056)},	/* Sierra Wireless Modem */
+ 	{DEVICE_SWI(0x1199, 0x9060)},	/* Sierra Wireless Modem */
+ 	{DEVICE_SWI(0x1199, 0x9061)},	/* Sierra Wireless Modem */
++	{DEVICE_SWI(0x1199, 0x9063)},	/* Sierra Wireless EM7305 */
+ 	{DEVICE_SWI(0x1199, 0x9070)},	/* Sierra Wireless MC74xx */
+ 	{DEVICE_SWI(0x1199, 0x9071)},	/* Sierra Wireless MC74xx */
+ 	{DEVICE_SWI(0x1199, 0x9078)},	/* Sierra Wireless EM74xx */