diff --git a/[refs] b/[refs] index f3d7ec7e8d93..1f0be2d1f1ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca7f4a3821aae53ab4ba5f7b14db9755b856d615 +refs/heads/master: 213cf90b9ad07d40c1e7aa5781907695107fe188 diff --git a/trunk/drivers/media/video/omap3isp/isppreview.c b/trunk/drivers/media/video/omap3isp/isppreview.c index 6d0fb2c8c26d..cf5014f2302d 100644 --- a/trunk/drivers/media/video/omap3isp/isppreview.c +++ b/trunk/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;