diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-07-23 10:06:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:18:16 -0200 |
| commit | fa34168bd8979ef00dbc35dbca6d7564d4e42798 (patch) | |
| tree | 7c83ea08d38b0fcaf436e42c3a1bf8f21dcba9f4 /drivers/media/video/uvc | |
| parent | 9c84d89bf13b702ca0e0db5eb3880300c4bd58f4 (diff) | |
| download | kernel_samsung_smdk4412-fa34168bd8979ef00dbc35dbca6d7564d4e42798.zip kernel_samsung_smdk4412-fa34168bd8979ef00dbc35dbca6d7564d4e42798.tar.gz kernel_samsung_smdk4412-fa34168bd8979ef00dbc35dbca6d7564d4e42798.tar.bz2 | |
[media] uvcvideo: Blacklist more controls for Hercules Dualpix Exchange
The Hercules Dualpix Exchange (06f8:3005) camera expose an absolute zoom
that is not implemented. Blacklist it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index a350fad..bce29fd 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -1499,26 +1499,46 @@ end: static void uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity) { - static const struct { + struct uvc_ctrl_blacklist { struct usb_device_id id; u8 index; - } blacklist[] = { + }; + + static const struct uvc_ctrl_blacklist processing_blacklist[] = { { { USB_DEVICE(0x13d3, 0x509b) }, 9 }, /* Gain */ { { USB_DEVICE(0x1c4f, 0x3000) }, 6 }, /* WB Temperature */ { { USB_DEVICE(0x5986, 0x0241) }, 2 }, /* Hue */ }; + static const struct uvc_ctrl_blacklist camera_blacklist[] = { + { { USB_DEVICE(0x06f8, 0x3005) }, 9 }, /* Zoom, Absolute */ + }; - u8 *controls; + const struct uvc_ctrl_blacklist *blacklist; unsigned int size; + unsigned int count; unsigned int i; + u8 *controls; - if (UVC_ENTITY_TYPE(entity) != UVC_VC_PROCESSING_UNIT) - return; + switch (UVC_ENTITY_TYPE(entity)) { + case UVC_VC_PROCESSING_UNIT: + blacklist = processing_blacklist; + count = ARRAY_SIZE(processing_blacklist); + controls = entity->processing.bmControls; + size = entity->processing.bControlSize; + break; + + case UVC_ITT_CAMERA: + blacklist = camera_blacklist; + count = ARRAY_SIZE(camera_blacklist); + controls = entity->camera.bmControls; + size = entity->camera.bControlSize; + break; - controls = entity->processing.bmControls; - size = entity->processing.bControlSize; + default: + return; + } - for (i = 0; i < ARRAY_SIZE(blacklist); ++i) { + for (i = 0; i < count; ++i) { if (!usb_match_one_id(dev->intf, &blacklist[i].id)) continue; |