aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-fimc
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2010-12-27 15:05:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 20:31:38 -0300
commite9654ef28740867c0aa151bbaec93f090f60cd24 (patch)
treed08707f02118ac3c559e7b58c37fa4951ddf0ba1 /drivers/media/video/s5p-fimc
parent3d0ce7ed037af9bafec498246d0e4af8302d993a (diff)
downloadkernel_samsung_tuna-e9654ef28740867c0aa151bbaec93f090f60cd24.zip
kernel_samsung_tuna-e9654ef28740867c0aa151bbaec93f090f60cd24.tar.gz
kernel_samsung_tuna-e9654ef28740867c0aa151bbaec93f090f60cd24.tar.bz2
[media] s5p-fimc: Enable interworking without subdev s_stream
Prevent VIDIOC_STREAMON failing when s_stream callback is not implemented by a sensor subdev driver. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-capture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 2dc6e82..c6689a2 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -191,7 +191,8 @@ static int fimc_stop_capture(struct fimc_dev *fimc)
FIMC_SHUTDOWN_TIMEOUT);
ret = v4l2_subdev_call(cap->sd, video, s_stream, 0);
- if (ret)
+
+ if (ret && ret != -ENOIOCTLCMD)
v4l2_err(&fimc->vid_cap.v4l2_dev, "s_stream(0) failed\n");
spin_lock_irqsave(&fimc->slock, flags);