summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-03-26 08:54:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-08 13:52:04 -0300
commit213cf90b9ad07d40c1e7aa5781907695107fe188 (patch)
treee14d163e085c49d952081507b640ee234cd9a952
parentca7f4a3821aae53ab4ba5f7b14db9755b856d615 (diff)
downloadtalos-op-linux-213cf90b9ad07d40c1e7aa5781907695107fe188.tar.gz
talos-op-linux-213cf90b9ad07d40c1e7aa5781907695107fe188.zip
[media] omap3isp: preview: Skip brightness and contrast in configuration ioctl
Brightness and contrast are handled through V4L2 controls. Their configuration bit in the preview engine update attributes table is set to -1 to reflect that. However, the VIDIOC_OMAP3ISP_PRV_CFG ioctl handler doesn't handle -1 correctly as a configuration bit value, and erroneously considers that the parameter has been selected for update by the ioctl caller. Fix this. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/omap3isp/isppreview.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index 6d0fb2c8c26d..cf5014f2302d 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -903,7 +903,7 @@ static int preview_config(struct isp_prev_device *prev,
attr = &update_attrs[i];
bit = 0;
- if (!(cfg->update & attr->cfg_bit))
+ if (attr->cfg_bit == -1 || !(cfg->update & attr->cfg_bit))
continue;
bit = cfg->flag & attr->cfg_bit;
OpenPOWER on IntegriCloud