summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2022-03-07 09:16:37 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2022-05-13 11:02:17 +0200
commit395829c61a196a0821a703a49c4db3ac51daff73 (patch)
tree68f1e3b517147b2c9e2ad295f0a25e7b1cf403d5
parent94e3dba710fe0afc772172305444250023fc2d30 (diff)
downloadlinux-395829c61a196a0821a703a49c4db3ac51daff73.tar.bz2
media: atmel: atmel-isc: Fix PM disable depth imbalance in atmel_isc_probe
The pm_runtime_enable will decrease power disable depth. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Fixes: 0a0e265515db ("media: atmel: atmel-isc: split driver into driver base and isc") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-rw-r--r--drivers/media/platform/atmel/atmel-sama5d2-isc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index c5b9563e36cb..e9415495e738 100644
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -562,7 +562,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(isc->ispck);
if (ret) {
dev_err(dev, "failed to enable ispck: %d\n", ret);
- goto cleanup_subdev;
+ goto disable_pm;
}
/* ispck should be greater or equal to hclock */
@@ -580,6 +580,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
unprepare_clk:
clk_disable_unprepare(isc->ispck);
+disable_pm:
+ pm_runtime_disable(dev);
+
cleanup_subdev:
isc_subdev_cleanup(isc);