diff options
| author | Dongliang Mu <mudongliangabcd@gmail.com> | 2021-10-19 05:00:29 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-11-30 12:05:53 +0100 |
| commit | fb394f3fc8c32564d15e48f29e89b736b68441cd (patch) | |
| tree | 7c070c758f7954f41c2c0fe4835f3ed671d0f522 /drivers/media/platform/sti/hva | |
| parent | 9175fb663af3df20a1bab5b5ac4b87b4460dddae (diff) | |
media: driver: hva: add pm_runtime_disable in the error handling code of hva_hw_probe
In the error handling code of hva_hw_probe, it fails to invoke
pm_runtime_disable in many error sites.
Fix this by adding a label err_disable with pm_runtime_disable and
adjust one goto from label err_clk to err_disable.
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform/sti/hva')
| -rw-r--r-- | drivers/media/platform/sti/hva/hva-hw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/sti/hva/hva-hw.c index 15e8f83b1b56..fe4ea2e7f37e 100644 --- a/drivers/media/platform/sti/hva/hva-hw.c +++ b/drivers/media/platform/sti/hva/hva-hw.c @@ -385,7 +385,7 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva) ret = pm_runtime_resume_and_get(dev); if (ret < 0) { dev_err(dev, "%s failed to set PM\n", HVA_PREFIX); - goto err_clk; + goto err_disable; } /* check IP hardware version */ @@ -403,6 +403,8 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva) err_pm: pm_runtime_put(dev); +err_disable: + pm_runtime_disable(dev); err_clk: if (hva->clk) clk_unprepare(hva->clk); |