[3.11.y.z extended stable] Patch "net: qmi_wwan: fix Cinterion PLXX product ID" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    net: qmi_wwan: fix Cinterion PLXX product ID

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From ae3fbc1fc86974efe854eece0dd38e4ff4e4a361 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander at lanedo.com>
Date: Wed, 25 Sep 2013 17:02:36 +0200
Subject: net: qmi_wwan: fix Cinterion PLXX product ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 2d77f343343c4f38b8f94be1964bbbc6456a147f upstream.

Cinterion PLXX LTE devices have a 0x0060 product ID, not 0x12d1.

The blacklisting in the serial/option driver does actually use the correct PID,
as per commit 8ff10bdb14a52e3f25d4ce09e0582a8684c1a6db ('USB: Blacklisted
Cinterion's PLxx WWAN Interface').

CC: Hans-Christoph Schemmel <hans-christoph.schemmel at gemalto.com>
CC: Christian Schmiedl <christian.schmiedl at gemalto.com>
CC: Nicolaus Colberg <nicolaus.colberg at gemalto.com>
Signed-off-by: Aleksander Morgado <aleksander at lanedo.com>
Acked-by: Bjørn Mork <bjorn at mork.no>
Acked-by: Christian Schmiedl <christian.schmiedl at gemalto.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/net/usb/qmi_wwan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 189e450bbc37..24a0e9f365d7 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -716,7 +716,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x2357, 0x9000, 4)},	/* TP-LINK MA260 */
 	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},	/* Telit LE920 */
 	{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},	/* Telit LE920 */
-	{QMI_FIXED_INTF(0x1e2d, 0x12d1, 4)},	/* Cinterion PLxx */
+	{QMI_FIXED_INTF(0x1e2d, 0x0060, 4)},	/* Cinterion PLxx */

 	/* 4. Gobi 1000 devices */
 	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
--
1.9.1