From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 19 Mar 2016 21:12:39 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v4.5.1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e56e81a4178006fac42a56d6966eb8924b84898a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	usb-serial-add-google-simple-serial-subclass-support.patch
---

diff --git a/queue-3.14/series b/queue-3.14/series
index 3943d708ce6..75c2f43491e 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -1 +1,2 @@
 target-drop-incorrect-abort_task-put-for-completed-commands.patch
+usb-serial-add-google-simple-serial-subclass-support.patch
diff --git a/queue-3.14/usb-serial-add-google-simple-serial-subclass-support.patch b/queue-3.14/usb-serial-add-google-simple-serial-subclass-support.patch
new file mode 100644
index 00000000000..f42987b2f29
--- /dev/null
+++ b/queue-3.14/usb-serial-add-google-simple-serial-subclass-support.patch
@@ -0,0 +1,67 @@
+From 679315e5fae1e4614eed0d9aa26999ddcb6a0f77 Mon Sep 17 00:00:00 2001
+From: Anton Staaf <robotboy@chromium.org>
+Date: Mon, 3 Nov 2014 08:43:20 -0800
+Subject: USB: serial: add Google simple serial SubClass support
+
+From: Anton Staaf <robotboy@chromium.org>
+
+commit 679315e5fae1e4614eed0d9aa26999ddcb6a0f77 upstream.
+
+Add support for Google devices that export simple serial
+interfaces using the vendor specific SubClass/Protocol pair
+0x50/0x01.
+
+Signed-off-by: Anton Staaf <robotboy@chromium.org>
+Reviewed-by: Benson Leung <bleung@chromium.org>
+[johan: move id entries and update Kconfig]
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/Kconfig             |    1 +
+ drivers/usb/serial/usb-serial-simple.c |   10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+--- a/drivers/usb/serial/Kconfig
++++ b/drivers/usb/serial/Kconfig
+@@ -59,6 +59,7 @@ config USB_SERIAL_SIMPLE
+ 	  driver.  Specifically, it supports:
+ 		- Suunto ANT+ USB device.
+ 		- Fundamental Software dongle.
++		- Google USB serial devices
+ 		- HP4x calculators
+ 		- a number of Motorola phones
+ 		- Siemens USB/MPI adapter.
+--- a/drivers/usb/serial/usb-serial-simple.c
++++ b/drivers/usb/serial/usb-serial-simple.c
+@@ -51,6 +51,14 @@ DEVICE(funsoft, FUNSOFT_IDS);
+ 	{ USB_DEVICE(0x8087, 0x0716) }
+ DEVICE(flashloader, FLASHLOADER_IDS);
+ 
++/* Google Serial USB SubClass */
++#define GOOGLE_IDS()						\
++	{ USB_VENDOR_AND_INTERFACE_INFO(0x18d1,			\
++					USB_CLASS_VENDOR_SPEC,	\
++					0x50,			\
++					0x01) }
++DEVICE(google, GOOGLE_IDS);
++
+ /* ViVOpay USB Serial Driver */
+ #define VIVOPAY_IDS()			\
+ 	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
+@@ -86,6 +94,7 @@ static struct usb_serial_driver * const
+ 	&zio_device,
+ 	&funsoft_device,
+ 	&flashloader_device,
++	&google_device,
+ 	&vivopay_device,
+ 	&moto_modem_device,
+ 	&hp4x_device,
+@@ -98,6 +107,7 @@ static const struct usb_device_id id_tab
+ 	ZIO_IDS(),
+ 	FUNSOFT_IDS(),
+ 	FLASHLOADER_IDS(),
++	GOOGLE_IDS(),
+ 	VIVOPAY_IDS(),
+ 	MOTO_IDS(),
+ 	HP4X_IDS(),