OSDN Git Service

[media] omap3isp: video: Validate the video node field order
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 19 May 2014 15:14:42 +0000 (12:14 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 21 Aug 2014 20:25:13 +0000 (15:25 -0500)
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>
drivers/media/platform/omap3isp/ispvideo.c

index 2fe1c46..756c162 100644 (file)
@@ -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;
 }
 
 /* -----------------------------------------------------------------------------