Skip to content

Commit

Permalink
V4L/DVB (13925): gspca - main: Change the check of the USB video inte…
Browse files Browse the repository at this point in the history
…rface.

Some webcams have many interfaces with the same interface class, so the
previous interface check did not work.
The new code checks if the interface number is zero or the only one.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 6f08126 commit b7a597d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b7a597d

Please sign in to comment.