]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2014 22:34:19 +0000 (15:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2014 22:34:19 +0000 (15:34 -0700)
added patches:
usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch
usb-qcserial-add-netgear-aircard-341u.patch

queue-3.14/series
queue-3.14/usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch [new file with mode: 0644]
queue-3.14/usb-qcserial-add-netgear-aircard-341u.patch [new file with mode: 0644]

index 2cba8f4399441897c9458d53b36f832361c88721..51a21b08b3d596989d703fc408a4868a98a6ea77 100644 (file)
@@ -49,3 +49,5 @@ usb-sierra-fix-use-after-free-at-suspend-resume.patch
 usb-sierra-fix-urb-and-memory-leak-in-resume-error-path.patch
 usb-sierra-fix-urb-and-memory-leak-on-disconnect.patch
 usb-sierra-fix-remote-wakeup.patch
+usb-qcserial-add-netgear-aircard-341u.patch
+usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch
diff --git a/queue-3.14/usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch b/queue-3.14/usb-qcserial-add-additional-sierra-wireless-qmi-devices.patch
new file mode 100644 (file)
index 0000000..ca7798e
--- /dev/null
@@ -0,0 +1,59 @@
+From 0ce5fb58564fd85aa8fd2d24209900e2e845317b Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Thu, 29 May 2014 13:33:27 +0200
+Subject: usb: qcserial: add additional Sierra Wireless QMI devices
+
+From: Aleksander Morgado <aleksander@aleksander.es>
+
+commit 0ce5fb58564fd85aa8fd2d24209900e2e845317b upstream.
+
+A set of new VID/PIDs retrieved from the out-of-tree GobiNet/GobiSerial
+Sierra Wireless drivers.
+
+Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
+Link: http://marc.info/?l=linux-usb&m=140136310027293&w=2
+Cc: <stable@vger.kernel.org>   # backport in link above
+Signed-off-by: Johan Hovold <jhovold@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -145,15 +145,33 @@ static const struct usb_device_id id_tab
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 0)},       /* Sierra Wireless EM7355 Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 2)},       /* Sierra Wireless EM7355 NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 3)},       /* Sierra Wireless EM7355 Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 3)},       /* Sierra Wireless Modem Modem */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 0)},       /* Sierra Wireless MC7305/MC7355 Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 2)},       /* Sierra Wireless MC7305/MC7355 NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 3)},       /* Sierra Wireless MC7305/MC7355 Modem */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)},       /* Netgear AirCard 340U Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)},       /* Netgear AirCard 340U NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)},       /* Netgear AirCard 340U Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 3)},       /* Sierra Wireless Modem Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 3)},       /* Sierra Wireless Modem Modem */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 0)},       /* Netgear AirCard 341U Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 2)},       /* Netgear AirCard 341U NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 3)},       /* Netgear AirCard 341U Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 3)},       /* Sierra Wireless Modem Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 3)},       /* Sierra Wireless Modem Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 0)},       /* Sierra Wireless Modem Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 2)},       /* Sierra Wireless Modem NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 3)},       /* Sierra Wireless Modem Modem */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 0)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 2)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 3)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Modem */
diff --git a/queue-3.14/usb-qcserial-add-netgear-aircard-341u.patch b/queue-3.14/usb-qcserial-add-netgear-aircard-341u.patch
new file mode 100644 (file)
index 0000000..a152936
--- /dev/null
@@ -0,0 +1,28 @@
+From ff1fcd50bc2459744e6f948310bc18eb7d6e8c72 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Wed, 28 May 2014 21:13:51 +0200
+Subject: usb: qcserial: add Netgear AirCard 341U
+
+From: Aleksander Morgado <aleksander@aleksander.es>
+
+commit ff1fcd50bc2459744e6f948310bc18eb7d6e8c72 upstream.
+
+Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -151,6 +151,9 @@ static const struct usb_device_id id_tab
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)},       /* Netgear AirCard 340U Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)},       /* Netgear AirCard 340U NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)},       /* Netgear AirCard 340U Modem */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 0)},       /* Netgear AirCard 341U Device Management */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 2)},       /* Netgear AirCard 341U NMEA */
++      {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 3)},       /* Netgear AirCard 341U Modem */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 0)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Device Management */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 2)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card NMEA */
+       {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 3)},       /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Modem */