---

yaml --- r: 331241 b: refs/heads/master c: 81c9bcf h: refs/heads/master i: 331239: bd0170b v: v3
git-mirror · Oct 2, 2012 · cee63d7 · cee63d7
1 parent 806ea73
commit cee63d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2331c991354a50bf65d114b2e88d77980223035
+refs/heads/master: 81c9bcfbefec212548058eeac612d98dc9290d55
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1215,7 +1215,7 @@ static int s5p_mfc_suspend(struct device *dev)
 
 	if (m_dev->num_inst == 0)
 		return 0;
-	return s5p_mfc_sleep(m_dev);
+
 	if (test_and_set_bit(0, &m_dev->enter_suspend) != 0) {
 		mfc_err("Error: going to suspend for a second time\n");
 		return -EIO;
@@ -1234,7 +1234,8 @@ static int s5p_mfc_suspend(struct device *dev)
 			return -EIO;
 		}
 	}
-	return 0;
+
+	return s5p_mfc_sleep(m_dev);
 }
 
 static int s5p_mfc_resume(struct device *dev)