---

yaml --- r: 276855 b: refs/heads/master c: 7aa9f18 h: refs/heads/master i: 276853: 51ee095 276851: a1a22d5 276847: 243d994 v: v3
git-mirror · Nov 24, 2011 · 53afe9f · 53afe9f
1 parent 2b5dd81
commit 53afe9f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64c570f505a0eac4914402bb7832d019c44eabd8
+refs/heads/master: 7aa9f1844a3aac428ef7977a9f1da706718afe0d
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/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);