From cf52df8acfda9442d64ab4d3d6085877f6d88d46 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Mon, 13 Jun 2011 11:09:40 -0300 Subject: [media] s5p-fimc: Correct color format enumeration Replace fimc_find_format() and find_mbus_format() with single function that can return a pointer to the private format description based on fourcc, media bus code or index in the table. Create separate VIDIOC_ENUM_FMT ioctl handlers for video capture and mem-to-mem video node. This is needed because some formats are valid only for the video capture and some only for the mem-to-mem video node. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/s5p-fimc/fimc-mdevice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/video/s5p-fimc/fimc-mdevice.c') diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/video/s5p-fimc/fimc-mdevice.c index 13ce2a43027c..5bb2c0de2cdc 100644 --- a/drivers/media/video/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/video/s5p-fimc/fimc-mdevice.c @@ -194,7 +194,7 @@ int fimc_pipeline_s_stream(struct fimc_dev *fimc, int on) if ((on && p->csis) || !on) ret = v4l2_subdev_call(on ? p->csis : p->sensor, video, s_stream, on); - if (ret && ret != -ENOIOCTLCMD) + if (ret < 0 && ret != -ENOIOCTLCMD) return ret; if ((!on && p->csis) || on) ret = v4l2_subdev_call(on ? p->sensor : p->csis, -- cgit v1.2.1