aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/s5p-fimc/fimc-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index 19ca6db38b2f..ef53528934f2 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -1615,7 +1615,6 @@ static int fimc_probe(struct platform_device *pdev)
1615 pdata = pdev->dev.platform_data; 1615 pdata = pdev->dev.platform_data;
1616 fimc->pdata = pdata; 1616 fimc->pdata = pdata;
1617 1617
1618 set_bit(ST_LPM, &fimc->state);
1619 1618
1620 init_waitqueue_head(&fimc->irq_queue); 1619 init_waitqueue_head(&fimc->irq_queue);
1621 spin_lock_init(&fimc->slock); 1620 spin_lock_init(&fimc->slock);
@@ -1780,7 +1779,6 @@ static int __devexit fimc_remove(struct platform_device *pdev)
1780 struct fimc_dev *fimc = platform_get_drvdata(pdev); 1779 struct fimc_dev *fimc = platform_get_drvdata(pdev);
1781 1780
1782 pm_runtime_disable(&pdev->dev); 1781 pm_runtime_disable(&pdev->dev);
1783 fimc_runtime_suspend(&pdev->dev);
1784 pm_runtime_set_suspended(&pdev->dev); 1782 pm_runtime_set_suspended(&pdev->dev);
1785 1783
1786 vb2_dma_contig_cleanup_ctx(fimc->alloc_ctx); 1784 vb2_dma_contig_cleanup_ctx(fimc->alloc_ctx);