---

yaml --- r: 181477 b: refs/heads/master c: b7a597d h: refs/heads/master i: 181475: 12730ad v: v3
git-mirror · Feb 26, 2010 · a49287c · a49287c
1 parent f895630
commit a49287c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f081264f835467a3b69edc71753dac9d3ff770a
+refs/heads/master: b7a597d11073c4c3db79743d38cc942d324b2233
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -2063,14 +2063,11 @@ int gspca_dev_probe(struct usb_interface *intf,
 		return -ENODEV;
 	}
 
-	/* check the interface class and ignore the sound interfaces */
+	/* the USB video interface must be the first one */
 	interface = &intf->cur_altsetting->desc;
-	if (interface->bInterfaceClass != USB_CLASS_VENDOR_SPEC
-	    && interface->bInterfaceClass != USB_CLASS_PER_INTERFACE) {
-		PDEBUG(D_PROBE, "Interface class %d not handled here",
-			interface->bInterfaceClass);
+	if (dev->config->desc.bNumInterfaces != 1 &&
+	    interface->bInterfaceNumber != 0)
 		return -ENODEV;
-	}
 
 	/* create the device */
 	if (dev_size < sizeof *gspca_dev)