iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: imx: imx-mipi-csis: Simplify mipi_csis_s_stream()

Browse Source 
Simplify the mipi_csis_s_stream() function.

This actually fixes a bug, as if calling the subdev's s_stream(1) fails,
mipi_csis_stop_stream() was not called.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Jacopo Mondi 2022-03-14 10:39:37 +00:00 committed by Mauro Carvalho Chehab
parent c22afddcf7
commit df4167d9c5
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/media/platform/nxp/imx-mipi-csis.c
View File

@ -926,43 +926,51 @@ static struct mipi_csis_device *sd_to_mipi_csis_device(struct v4l2_subdev *sdev)
static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
{
struct mipi_csis_device *csis = sd_to_mipi_csis_device(sd);
int ret = 0;
int ret;
if (enable) {
ret = mipi_csis_calculate_params(csis);
if (ret < 0)
return ret;
if (!enable) {
mutex_lock(&csis->lock);
mipi_csis_clear_counters(csis);
ret = pm_runtime_resume_and_get(csis->dev);
if (ret < 0)
return ret;
}
mutex_lock(&csis->lock);
if (enable) {
mipi_csis_start_stream(csis);
ret = v4l2_subdev_call(csis->src_sd, video, s_stream, 1);
if (ret < 0)
goto unlock;
mipi_csis_log_counters(csis, true);
} else {
v4l2_subdev_call(csis->src_sd, video, s_stream, 0);
mipi_csis_stop_stream(csis);
if (csis->debug.enable)
mipi_csis_log_counters(csis, true);
mutex_unlock(&csis->lock);
pm_runtime_put(csis->dev);
return 0;
}
unlock:
ret = mipi_csis_calculate_params(csis);
if (ret < 0)
return ret;
mipi_csis_clear_counters(csis);
ret = pm_runtime_resume_and_get(csis->dev);
if (ret < 0)
return ret;
mutex_lock(&csis->lock);
mipi_csis_start_stream(csis);
ret = v4l2_subdev_call(csis->src_sd, video, s_stream, 1);
if (ret < 0)
goto error;
mipi_csis_log_counters(csis, true);
mutex_unlock(&csis->lock);
if (!enable || ret < 0)
pm_runtime_put(csis->dev);
return 0;
error:
mipi_csis_stop_stream(csis);
mutex_unlock(&csis->lock);
pm_runtime_put(csis->dev);
return ret;
}