diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-12-29 01:19:09 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-12-29 01:19:09 +0100 |
| commit | 0a2cf3a87146a65721f0bd83e4759c7bfec8fdfe (patch) | |
| tree | eda2c3f41d1c395fa3cd4bff4766343a07c577bb /linux/drivers/media/video/uvc/uvc_driver.c | |
| parent | c60eeb90b566a1e86113d543f98af82a5a8b58b4 (diff) | |
| parent | 326c879e45fc05f8c257a51ac785cf14dda01b28 (diff) | |
| download | mediapointer-dvb-s2-0a2cf3a87146a65721f0bd83e4759c7bfec8fdfe.tar.gz mediapointer-dvb-s2-0a2cf3a87146a65721f0bd83e4759c7bfec8fdfe.tar.bz2 | |
merge: http://linuxtv.org/hg/v4l-dvb
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_driver.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_driver.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_driver.c b/linux/drivers/media/video/uvc/uvc_driver.c index 343792f0f..d75bc915a 100644 --- a/linux/drivers/media/video/uvc/uvc_driver.c +++ b/linux/drivers/media/video/uvc/uvc_driver.c @@ -1147,8 +1147,13 @@ next_descriptor: buffer += buffer[0]; } - /* Check if the optional status endpoint is present. */ - if (alts->desc.bNumEndpoints == 1) { + /* Check if the optional status endpoint is present. Built-in iSight + * webcams have an interrupt endpoint but spit proprietary data that + * don't conform to the UVC status endpoint messages. Don't try to + * handle the interrupt endpoint for those cameras. + */ + if (alts->desc.bNumEndpoints == 1 && + !(dev->quirks & UVC_QUIRK_BUILTIN_ISIGHT)) { struct usb_host_endpoint *ep = &alts->endpoint[0]; struct usb_endpoint_descriptor *desc = &ep->desc; |