diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-12-29 00:26:32 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-12-29 00:26:32 +0100 |
| commit | 326c879e45fc05f8c257a51ac785cf14dda01b28 (patch) | |
| tree | fe720f0fb1f208f461608a9a5596bf946fd9244b /linux/drivers/media/video | |
| parent | d3b9334a55811e523ddf592d3a00a08b9a30dc6a (diff) | |
| download | mediapointer-dvb-s2-326c879e45fc05f8c257a51ac785cf14dda01b28.tar.gz mediapointer-dvb-s2-326c879e45fc05f8c257a51ac785cf14dda01b28.tar.bz2 | |
uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
From: Laurent Pinchart <laurent.pinchart@skynet.be>
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.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers/media/video')
| -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; |