---

yaml --- r: 295083 b: refs/heads/master c: 68a6bb5 h: refs/heads/master i: 295081: f171728 295079: 4c0e408 v: v3
git-mirror · Mar 19, 2012 · c63a5f7 · c63a5f7
1 parent 6207784
commit c63a5f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e7252c62f5ccddcb4ced0910887b0e19663011
+refs/heads/master: 68a6bb546575a2ba62baddbde710fac42ff04f19
diff --git a/trunk/drivers/media/video/s5p-fimc/mipi-csis.c b/trunk/drivers/media/video/s5p-fimc/mipi-csis.c
@@ -684,7 +684,7 @@ static int __devexit s5pcsis_remove(struct platform_device *pdev)
 	struct csis_state *state = sd_to_csis_state(sd);
 
 	pm_runtime_disable(&pdev->dev);
-	s5pcsis_suspend(&pdev->dev);
+	s5pcsis_pm_suspend(&pdev->dev, false);
 	clk_disable(state->clock[CSIS_CLK_MUX]);
 	pm_runtime_set_suspended(&pdev->dev);
 	s5pcsis_clk_put(state);