From c3fcb38c519d985cf4ae7d2a9b4f64954afc8b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Sun, 15 Jul 2012 16:47:39 +0200
Subject: [PATCH] --- yaml --- r: 317059 b: refs/heads/master c:
 e7ad21e00eab6b77fb9b5cd79512b7dee473f476 h: refs/heads/master i:   317057:
 7a9831d49606a4e2698891543c05fc26d48f56e7   317055:
 c31ed1a30add53d3b7ad0a2a4474bbff2f75627c v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/serial/qcserial.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 55fa82ecd687..ac253441701b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfbf65eb070a6dda535fcfec6028a7412698358
+refs/heads/master: e7ad21e00eab6b77fb9b5cd79512b7dee473f476
diff --git a/trunk/drivers/usb/serial/qcserial.c b/trunk/drivers/usb/serial/qcserial.c
index a9c4dc4eb05f..90395c7aa56a 100644
--- a/trunk/drivers/usb/serial/qcserial.c
+++ b/trunk/drivers/usb/serial/qcserial.c
@@ -165,6 +165,13 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
 
 	}
 
+	/* allow any number of interfaces when doing direct interface match */
+	if (id->match_flags & USB_DEVICE_ID_MATCH_INT_NUMBER) {
+		dev_dbg(dev, "Generic Qualcomm serial interface found\n");
+		altsetting = 0;
+		goto done;
+	}
+
 	if (nintf < 3 || nintf > 4) {
 		dev_err(dev, "unknown number of interfaces: %d\n", nintf);
 		goto done;