diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-01-08 01:05:19 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-04-06 11:39:27 +0200 |
| commit | 8f5586dc2d1829d16f602b3d3237b9415ca95cce (patch) | |
| tree | 106a4bad048536ee4fbf72210c9d49d07ecda9e6 /drivers/staging/media | |
| parent | 212d34e050a5022db1246691b84668d3afa63e6c (diff) | |
media: imx: imx7_mipi_csis: Runtime suspend in .s_stream() error path
If the .s_stream() handler fails after calling pm_runtime_get_sync(),
call pm_runtime_put() in the error path.
While at it add a few blank lines to make the code more readable.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/imx/imx7-mipi-csis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c index bd587e550d99..c6cd60896969 100644 --- a/drivers/staging/media/imx/imx7-mipi-csis.c +++ b/drivers/staging/media/imx/imx7-mipi-csis.c @@ -694,6 +694,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable) return ret; mipi_csis_clear_counters(state); + ret = pm_runtime_get_sync(&state->pdev->dev); if (ret < 0) { pm_runtime_put_noidle(&state->pdev->dev); @@ -701,10 +702,11 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable) } ret = v4l2_subdev_call(state->src_sd, core, s_power, 1); if (ret < 0 && ret != -ENOIOCTLCMD) - return ret; + goto done; } mutex_lock(&state->lock); + if (enable) { if (state->flags & ST_SUSPENDED) { ret = -EBUSY; @@ -732,7 +734,9 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable) unlock: mutex_unlock(&state->lock); - if (!enable) + +done: + if (!enable || ret < 0) pm_runtime_put(&state->pdev->dev); return ret; |