diff --git a/[refs] b/[refs]
index 62ac4e08e0fc..8a007e4221e8 100644
--- 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
index caeac199d15b..2b906753f13c 100644
--- 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 = {