Commit eb228e89 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[media] omap3isp: Don't ignore subdev streamoff failures

Record the value returned by subdevs from s_stream(0) and handle stop
failures when an error occurs.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarEnrico Butera <ebutera@users.sourceforge.net>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 24acf8b2
...@@ -999,16 +999,14 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe) ...@@ -999,16 +999,14 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
video, s_stream, 0); video, s_stream, 0);
} }
v4l2_subdev_call(subdev, video, s_stream, 0); ret = v4l2_subdev_call(subdev, video, s_stream, 0);
if (subdev == &isp->isp_res.subdev) if (subdev == &isp->isp_res.subdev)
ret = isp_pipeline_wait(isp, isp_pipeline_wait_resizer); ret |= isp_pipeline_wait(isp, isp_pipeline_wait_resizer);
else if (subdev == &isp->isp_prev.subdev) else if (subdev == &isp->isp_prev.subdev)
ret = isp_pipeline_wait(isp, isp_pipeline_wait_preview); ret |= isp_pipeline_wait(isp, isp_pipeline_wait_preview);
else if (subdev == &isp->isp_ccdc.subdev) else if (subdev == &isp->isp_ccdc.subdev)
ret = isp_pipeline_wait(isp, isp_pipeline_wait_ccdc); ret |= isp_pipeline_wait(isp, isp_pipeline_wait_ccdc);
else
ret = 0;
/* Handle stop failures. An entity that fails to stop can /* Handle stop failures. An entity that fails to stop can
* usually just be restarted. Flag the stop failure nonetheless * usually just be restarted. Flag the stop failure nonetheless
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment