diff options
| author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-05-21 15:29:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-30 10:38:27 +0100 |
| commit | 8526b2ea2f6bf86c968da84f8e7e5c9cb9a710c6 (patch) | |
| tree | 18893ef3257200517ba0b69d82a88e343fa59390 | |
| parent | fc71303c1fc7fc03ffd6629adcd6dc9472a9e2e9 (diff) | |
| download | linux-stable-8526b2ea2f6bf86c968da84f8e7e5c9cb9a710c6.tar.gz linux-stable-8526b2ea2f6bf86c968da84f8e7e5c9cb9a710c6.tar.bz2 linux-stable-8526b2ea2f6bf86c968da84f8e7e5c9cb9a710c6.zip | |
media: platform: s3c-camif: Fix runtime PM imbalance on error
[ Upstream commit dafa3605fe60d5a61239d670919b2a36e712481e ]
pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.
Also, call pm_runtime_disable() when pm_runtime_get_sync() returns
an error code.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: Sylwester Nawrocki <snawrocki@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/media/platform/s3c-camif/camif-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c index 79bc0ef6bb41..8d8ed72bd0aa 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -476,7 +476,7 @@ static int s3c_camif_probe(struct platform_device *pdev) ret = camif_media_dev_init(camif); if (ret < 0) - goto err_alloc; + goto err_pm; ret = camif_register_sensor(camif); if (ret < 0) @@ -510,10 +510,9 @@ err_sens: media_device_unregister(&camif->media_dev); media_device_cleanup(&camif->media_dev); camif_unregister_media_entities(camif); -err_alloc: +err_pm: pm_runtime_put(dev); pm_runtime_disable(dev); -err_pm: camif_clk_put(camif); err_clk: s3c_camif_unregister_subdev(camif); |