aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2008-12-28 18:26:32 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:31 -0500
commit538e7a004bf960c96c7e9eb836b59989eb5f5b7f (patch)
treef91e0e40b9ca9678033c81593680f4d51d363713
parentf8dd4af6d44b4b738f125f6a21afa885f3b1d13b (diff)
V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
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. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/uvc/uvc_driver.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 1054c7656aef..18a61928f4f6 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1147,8 +1147,13 @@ next_descriptor:
1147 buffer += buffer[0]; 1147 buffer += buffer[0];
1148 } 1148 }
1149 1149
1150 /* Check if the optional status endpoint is present. */ 1150 /* Check if the optional status endpoint is present. Built-in iSight
1151 if (alts->desc.bNumEndpoints == 1) { 1151 * webcams have an interrupt endpoint but spit proprietary data that
1152 * don't conform to the UVC status endpoint messages. Don't try to
1153 * handle the interrupt endpoint for those cameras.
1154 */
1155 if (alts->desc.bNumEndpoints == 1 &&
1156 !(dev->quirks & UVC_QUIRK_BUILTIN_ISIGHT)) {
1152 struct usb_host_endpoint *ep = &alts->endpoint[0]; 1157 struct usb_host_endpoint *ep = &alts->endpoint[0];
1153 struct usb_endpoint_descriptor *desc = &ep->desc; 1158 struct usb_endpoint_descriptor *desc = &ep->desc;
1154 1159