From: Laurent Pinchart Date: Mon, 26 Mar 2012 11:54:26 +0000 (-0300) Subject: [media] omap3isp: preview: Skip brightness and contrast in configuration ioctl X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=213cf90b9ad07d40c1e7aa5781907695107fe188;p=openwrt%2Fstaging%2Fblogic.git [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 Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- 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;