|
@@ -999,16 +999,14 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
|
|
|
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)
|
|
|
- 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)
|
|
|
- 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)
|
|
|
- ret = isp_pipeline_wait(isp, isp_pipeline_wait_ccdc);
|
|
|
- else
|
|
|
- ret = 0;
|
|
|
+ ret |= isp_pipeline_wait(isp, isp_pipeline_wait_ccdc);
|
|
|
|
|
|
/* Handle stop failures. An entity that fails to stop can
|
|
|
* usually just be restarted. Flag the stop failure nonetheless
|