From c63a5f705f851e6b2d871278bbed9ed20c29cf60 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 9 Mar 2012 08:56:39 -0300 Subject: [PATCH] --- yaml --- r: 295083 b: refs/heads/master c: 68a6bb546575a2ba62baddbde710fac42ff04f19 h: refs/heads/master i: 295081: f171728203e6a35e1241468cbc87fe46c166c107 295079: 4c0e4089f64e1ecc6b8d6ebcbec28265cd1b83a7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/mipi-csis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 871fd94f164b..4e2c862b6124 100644 --- 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 index a903138b18da..f44f690397f7 100644 --- 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);