---

yaml --- r: 181454 b: refs/heads/master c: 52a9d3e h: refs/heads/master v: v3
git-mirror · Feb 26, 2010 · d7be9b2 · d7be9b2
1 parent 66b880e
commit d7be9b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38719d45f937178718d49516d1f72208d5d72d22
+refs/heads/master: 52a9d3ef0034f29cef1c5616faa72aa394b01b65
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -2062,9 +2062,13 @@ int gspca_dev_probe(struct usb_interface *intf,
 		PDEBUG(D_ERR, "Too many config");
 		return -ENODEV;
 	}
+
+	/* check the interface class and ignore the sound interfaces */
 	interface = &intf->cur_altsetting->desc;
-	if (interface->bInterfaceNumber > 0) {
-		PDEBUG(D_ERR, "intf != 0");
+	if (interface->bInterfaceClass != USB_CLASS_VENDOR_SPEC
+	    && interface->bInterfaceClass != USB_CLASS_PER_INTERFACE) {
+		PDEBUG(D_PROBE, "Interface class %d not handled here",
+			interface->bInterfaceClass);
 		return -ENODEV;
 	}