diff options
| author | Sylwester Nawrocki | 2011-11-04 13:59:52 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-11-25 00:01:50 +0100 |
| commit | 7aa9f1844a3aac428ef7977a9f1da706718afe0d (patch) | |
| tree | e1d76d7c5808e305b13b07edaefdbc66e35c6ff2 /drivers/media/video/s5p-fimc | |
| parent | [media] s5p-fimc: Fix error in the capture subdev deinitialization (diff) | |
| download | kernel-qcow2-linux-7aa9f1844a3aac428ef7977a9f1da706718afe0d.tar.gz kernel-qcow2-linux-7aa9f1844a3aac428ef7977a9f1da706718afe0d.tar.xz kernel-qcow2-linux-7aa9f1844a3aac428ef7977a9f1da706718afe0d.zip | |
[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>
Diffstat (limited to 'drivers/media/video/s5p-fimc')
| -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) pdata = pdev->dev.platform_data; fimc->pdata = pdata; - set_bit(ST_LPM, &fimc->state); init_waitqueue_head(&fimc->irq_queue); spin_lock_init(&fimc->slock); @@ -1780,7 +1779,6 @@ static int __devexit fimc_remove(struct platform_device *pdev) struct fimc_dev *fimc = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev); - fimc_runtime_suspend(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); vb2_dma_contig_cleanup_ctx(fimc->alloc_ctx); |