---

yaml --- r: 192880 b: refs/heads/master c: aa2dc90 h: refs/heads/master v: v3
git-mirror · May 18, 2010 · 8187fd8 · 8187fd8
1 parent 2b55d39
commit 8187fd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21aa300e160f03c237d2153d9938e14a87f38e0d
+refs/heads/master: aa2dc9034859531206889b6bf07b5f9adae487a6
diff --git a/trunk/drivers/media/video/davinci/vpfe_capture.c b/trunk/drivers/media/video/davinci/vpfe_capture.c
@@ -2031,18 +2031,14 @@ static int __devexit vpfe_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int
-vpfe_suspend(struct device *dev)
+static int vpfe_suspend(struct device *dev)
 {
-	/* add suspend code here later */
-	return -1;
+	return 0;
 }
 
-static int
-vpfe_resume(struct device *dev)
+static int vpfe_resume(struct device *dev)
 {
-	/* add resume code here later */
-	return -1;
+	return 0;
 }
 
 static const struct dev_pm_ops vpfe_dev_pm_ops = {