summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart2012-07-05 19:31:33 +0200
committerMauro Carvalho Chehab2012-07-07 00:36:39 +0200
commit7103180b4385de908d69815dbd6807879d371cbf (patch)
treedb3847302d612996dddd51996e9222913792c09b
parent[media] winbond-cir: Initialise timeout, driver_type and allowed_protos (diff)
downloadkernel-qcow2-linux-7103180b4385de908d69815dbd6807879d371cbf.tar.gz
kernel-qcow2-linux-7103180b4385de908d69815dbd6807879d371cbf.tar.xz
kernel-qcow2-linux-7103180b4385de908d69815dbd6807879d371cbf.zip
[media] omap3isp: preview: Fix output size computation depending on input format
The preview engine crops 4 columns and 4 lines when CFA is enabled. Commit b2da46e52fe7871cba36e1a435844502c0eccf39 ("omap3isp: preview: Add support for greyscale input") inverted the condition by mistake, fix this. Reported-by: Florian Neuhaus <florian.neuhaus@reberinformatik.ch> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Florian Neuhaus <florian.neuhaus@reberinformatik.ch> 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 8a4935ecc655..a48a747b6fcc 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -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;