From: Arne Caspari Date: Sat, 30 Jul 2011 11:29:11 +0000 (-0300) Subject: [media] uvcvideo: Detect The Imaging Source CCD cameras by vendor and product ID X-Git-Tag: MMI-PSA29.97-13-9~18177^2~95 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] uvcvideo: Detect The Imaging Source CCD cameras by vendor and product ID The Imaging Source CCD cameras use a vendor specific interface class even though they are actually UVC compliant. Signed-off-by: Arne Caspari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index e4100b1f68df..a3c24dd875fc 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c @@ -2331,6 +2331,14 @@ static struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_PROBE_DEF }, + /* The Imaging Source USB CCD cameras */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x199e, + .idProduct = 0x8102, + .bInterfaceClass = USB_CLASS_VENDOR_SPEC, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0 }, /* Bodelin ProScopeHR */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_DEV_HI