---

yaml --- r: 317059 b: refs/heads/master c: e7ad21e h: refs/heads/master i: 317057: 7a9831d 317055: c31ed1a v: v3
git-mirror · Jul 17, 2012 · c3fcb38 · c3fcb38
1 parent 30d2dd8
commit c3fcb38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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;