summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvc_driver.c
diff options
context:
space:
mode:
authorArne Caspari <arne@unicap-imaging.org>2011-07-30 08:29:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-23 20:06:30 -0300
commitfd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6 (patch)
treeab5488aea77fabcdb8f28d0a87c3808be81fb622 /drivers/media/video/uvc/uvc_driver.c
parent547d42eac107f027e6101b828f9e4075f2fbcc7c (diff)
downloadop-kernel-dev-fd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6.zip
op-kernel-dev-fd3e9f2f9a4c46f5d67d384c78b2d364c99d3de6.tar.gz
[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 <arne@unicap-imaging.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_driver.c')
-rw-r--r--drivers/media/video/uvc/uvc_driver.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index e4100b1..a3c24dd 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
OpenPOWER on IntegriCloud