aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-05-19 20:15:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:33:25 -0300
commit3653639e5daf2ac5f4763e4f1b6cb57538184be9 (patch)
treed80eb99b2e9ab315de40f3068af8a790b1378261 /drivers/media
parente56be916660da811fe4e830dfb958f13af361d59 (diff)
downloadkernel_samsung_smdk4412-3653639e5daf2ac5f4763e4f1b6cb57538184be9.zip
kernel_samsung_smdk4412-3653639e5daf2ac5f4763e4f1b6cb57538184be9.tar.gz
kernel_samsung_smdk4412-3653639e5daf2ac5f4763e4f1b6cb57538184be9.tar.bz2
V4L/DVB: uvcvideo: Make button controls work properly
According to the v4l2 spec, writing any value to a button control should result in the action belonging to the button control being triggered. UVC cams however want to see a 1 written, this patch fixes this by overriding whatever value user space passed in with -1 (0xffffffff) when the control is a button control. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/uvc/uvc_ctrl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index fcfcfbc..4e6d484 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -698,6 +698,14 @@ static void uvc_set_le_value(struct uvc_control_mapping *mapping,
int offset = mapping->offset;
__u8 mask;
+ /* According to the v4l2 spec, writing any value to a button control
+ * should result in the action belonging to the button control being
+ * triggered. UVC devices however want to see a 1 written -> override
+ * value.
+ */
+ if (mapping->v4l2_type == V4L2_CTRL_TYPE_BUTTON)
+ value = -1;
+
data += offset / 8;
offset &= 7;