diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2011-11-04 08:59:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-24 18:01:50 -0500 |
commit | 7aa9f1844a3aac428ef7977a9f1da706718afe0d (patch) | |
tree | e1d76d7c5808e305b13b07edaefdbc66e35c6ff2 | |
parent | 64c570f505a0eac4914402bb7832d019c44eabd8 (diff) |
[media] s5p-fimc: Fix initialization for proper system suspend support
ST_LPM bit must not be initially set, so the first resume helper
call properly quiesce the device's operation.
Also fimc_runtime_suspend() at device remove is unneeded and
leads to unbalanced clock disable so remove it.
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>
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.c | 2 |
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); |