summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/ispvideo.c
diff options
context:
space:
mode:
authorLaurent Pinchart2014-05-19 17:14:42 +0200
committerMauro Carvalho Chehab2014-08-21 22:25:13 +0200
commitf7abbe989f7aa5e1d65fc7f171b8c144f4382045 (patch)
tree9677cbb8857a9f729ef4db381c68349cbc6508ba /drivers/media/platform/omap3isp/ispvideo.c
parent[media] omap3isp: Default to progressive field order when setting the format (diff)
downloadkernel-qcow2-linux-f7abbe989f7aa5e1d65fc7f171b8c144f4382045.tar.gz
kernel-qcow2-linux-f7abbe989f7aa5e1d65fc7f171b8c144f4382045.tar.xz
kernel-qcow2-linux-f7abbe989f7aa5e1d65fc7f171b8c144f4382045.zip
[media] omap3isp: video: Validate the video node field order
The field order requested on the video node must match the field order at the connected subdevice source pad. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Enrico Butera <ebutera@users.sourceforge.net> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/ispvideo.c')
-rw-r--r--drivers/media/platform/omap3isp/ispvideo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 2fe1c463232d..756c1628ef86 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -309,10 +309,11 @@ isp_video_check_format(struct isp_video *video, struct isp_video_fh *vfh)
vfh->format.fmt.pix.height != format.fmt.pix.height ||
vfh->format.fmt.pix.width != format.fmt.pix.width ||
vfh->format.fmt.pix.bytesperline != format.fmt.pix.bytesperline ||
- vfh->format.fmt.pix.sizeimage != format.fmt.pix.sizeimage)
+ vfh->format.fmt.pix.sizeimage != format.fmt.pix.sizeimage ||
+ vfh->format.fmt.pix.field != format.fmt.pix.field)
return -EINVAL;
- return ret;
+ return 0;
}
/* -----------------------------------------------------------------------------