diff options
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-lite.c')
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-lite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c index 1234734bccf4..779ec3cd259d 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/exynos4-is/fimc-lite.c | |||
@@ -1563,7 +1563,7 @@ static int fimc_lite_probe(struct platform_device *pdev) | |||
1563 | if (!pm_runtime_enabled(dev)) { | 1563 | if (!pm_runtime_enabled(dev)) { |
1564 | ret = clk_enable(fimc->clock); | 1564 | ret = clk_enable(fimc->clock); |
1565 | if (ret < 0) | 1565 | if (ret < 0) |
1566 | goto err_clk_put; | 1566 | goto err_sd; |
1567 | } | 1567 | } |
1568 | 1568 | ||
1569 | fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev); | 1569 | fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev); |
@@ -1579,7 +1579,8 @@ static int fimc_lite_probe(struct platform_device *pdev) | |||
1579 | return 0; | 1579 | return 0; |
1580 | 1580 | ||
1581 | err_clk_dis: | 1581 | err_clk_dis: |
1582 | clk_disable(fimc->clock); | 1582 | if (!pm_runtime_enabled(dev)) |
1583 | clk_disable(fimc->clock); | ||
1583 | err_sd: | 1584 | err_sd: |
1584 | fimc_lite_unregister_capture_subdev(fimc); | 1585 | fimc_lite_unregister_capture_subdev(fimc); |
1585 | err_clk_put: | 1586 | err_clk_put: |
@@ -1587,6 +1588,7 @@ err_clk_put: | |||
1587 | return ret; | 1588 | return ret; |
1588 | } | 1589 | } |
1589 | 1590 | ||
1591 | #ifdef CONFIG_PM_RUNTIME | ||
1590 | static int fimc_lite_runtime_resume(struct device *dev) | 1592 | static int fimc_lite_runtime_resume(struct device *dev) |
1591 | { | 1593 | { |
1592 | struct fimc_lite *fimc = dev_get_drvdata(dev); | 1594 | struct fimc_lite *fimc = dev_get_drvdata(dev); |
@@ -1602,6 +1604,7 @@ static int fimc_lite_runtime_suspend(struct device *dev) | |||
1602 | clk_disable(fimc->clock); | 1604 | clk_disable(fimc->clock); |
1603 | return 0; | 1605 | return 0; |
1604 | } | 1606 | } |
1607 | #endif | ||
1605 | 1608 | ||
1606 | #ifdef CONFIG_PM_SLEEP | 1609 | #ifdef CONFIG_PM_SLEEP |
1607 | static int fimc_lite_resume(struct device *dev) | 1610 | static int fimc_lite_resume(struct device *dev) |