diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /drivers/media/video/omap3isp/isppreview.c | |
parent | 7664e969359917ba3212c5d6efdec494eaf8586e (diff) | |
parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'drivers/media/video/omap3isp/isppreview.c')
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index 8a4935ecc655..dd91da26f1b0 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c @@ -888,12 +888,12 @@ static const struct preview_update update_attrs[] = { preview_config_contrast, NULL, offsetof(struct prev_params, contrast), - 0, true, + 0, 0, true, }, /* OMAP3ISP_PREV_BRIGHTNESS */ { preview_config_brightness, NULL, offsetof(struct prev_params, brightness), - 0, true, + 0, 0, true, }, }; @@ -1102,7 +1102,7 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active) unsigned int elv = prev->crop.top + prev->crop.height - 1; u32 features; - if (format->code == V4L2_MBUS_FMT_Y10_1X10) { + if (format->code != V4L2_MBUS_FMT_Y10_1X10) { sph -= 2; eph += 2; slv -= 2; |