From: Sylwester Nawrocki Date: Mon, 27 Dec 2010 18:05:58 +0000 (-0300) Subject: [media] s5p-fimc: Enable interworking without subdev s_stream X-Git-Tag: firefly_0821_release~7613^2~1709^2~418 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9654ef28740867c0aa151bbaec93f090f60cd24;p=firefly-linux-kernel-4.4.55.git [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 Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 2dc6e82c8084..c6689a24c85b 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);