aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-04-18 14:26:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-25 09:37:12 -0300
commitb34f51fad396484e2bc102dcf95807b9990c3265 (patch)
tree5992adaa3488f9934b1ea98c9bbf79eec131c7c2 /drivers
parent0e30c7e1f1a162d0c2026cdc5ad4f0f0a7332fc6 (diff)
downloadvexpress-lsk-b34f51fad396484e2bc102dcf95807b9990c3265.tar.gz
[media] exynos4-is: Fix runtime PM handling on fimc-is probe error path
Ensure there is no unbalanced pm_runtime_put(). Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/exynos4-is/fimc-is.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 5e890776d16..47c6363d04e 100644
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -847,16 +847,17 @@ static int fimc_is_probe(struct platform_device *pdev)
goto err_irq;
ret = fimc_is_setup_clocks(is);
+ pm_runtime_put_sync(dev);
+
if (ret < 0)
goto err_irq;
- pm_runtime_put_sync(dev);
is->clk_init = true;
is->alloc_ctx = vb2_dma_contig_init_ctx(dev);
if (IS_ERR(is->alloc_ctx)) {
ret = PTR_ERR(is->alloc_ctx);
- goto err_pm;
+ goto err_irq;
}
/*
* Register FIMC-IS V4L2 subdevs to this driver. The video nodes
@@ -885,8 +886,6 @@ err_sd:
fimc_is_unregister_subdevs(is);
err_irq:
free_irq(is->irq, is);
-err_pm:
- pm_runtime_put(dev);
err_clk:
fimc_is_put_clocks(is);
return ret;