From ae9d47c8e25c661e6d8e74f55972f6b41b94a35a Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 18 May 2012 13:31:28 -0300 Subject: [PATCH] --- yaml --- r: 311881 b: refs/heads/master c: 316efab3e949e4fbdacb0975bf33adbad89115db h: refs/heads/master i: 311879: 4cdb65afa05103b22236129523057ba4063f8e10 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-lite.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8fb27adf276d..b342b7e022f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3fc82e8b9f550d28f05600b98bcc8c26beef2ef +refs/heads/master: 316efab3e949e4fbdacb0975bf33adbad89115db diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-lite.c b/trunk/drivers/media/video/s5p-fimc/fimc-lite.c index bbe93e4a8731..b0a8ce61ebf2 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-lite.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-lite.c @@ -1510,7 +1510,7 @@ static int fimc_lite_suspend(struct device *dev) return 0; ret = fimc_lite_stop_capture(fimc, suspend); - if (ret) + if (ret < 0 || !fimc_lite_active(fimc)) return ret; return fimc_pipeline_shutdown(&fimc->pipeline);