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);