---

yaml --- r: 285737 b: refs/heads/master c: f664684 h: refs/heads/master i: 285735: 96976a7 v: v3
git-mirror · Jan 6, 2012 · e637c69 · e637c69
1 parent 8ff7e70
commit e637c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1d99f39fbd0218b8f8f6548e5522cbc2124f949
+refs/heads/master: f664684a56deb7675363e2fa3f1e2a5eedbb3222
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c
@@ -1784,9 +1784,8 @@ static int fimc_runtime_resume(struct device *dev)
 	/* Resume the capture or mem-to-mem device */
 	if (fimc_capture_busy(fimc))
 		return fimc_capture_resume(fimc);
-	else if (fimc_m2m_pending(fimc))
-		return fimc_m2m_resume(fimc);
-	return 0;
+
+	return fimc_m2m_resume(fimc);
 }
 
 static int fimc_runtime_suspend(struct device *dev)