From 36ea1ca22dda462c9b3a605f50e05a255c925471 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 18 Jul 2012 10:54:02 -0300
Subject: [PATCH] --- yaml --- r: 330863 b: refs/heads/master c:
 24592adce89805c99eb23d1e37aa8a66aaacee05 h: refs/heads/master i:   330861:
 d1ee73c29063ccfb067a55050714f4425e6e7936   330859:
 86291104711669873c3a82eb36c4a24af315a4e4   330855:
 b97ffc7fae939809a376be496c8b4eb39a70e2d9   330847:
 fd29f650192b7946db7c28cd99237669d11cde06 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/platform/soc_camera.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6389e405eddc..73ceebdec43c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37ad4e734bbc27ad1bec2d1cc3ffaa79b1def262
+refs/heads/master: 24592adce89805c99eb23d1e37aa8a66aaacee05
diff --git a/trunk/drivers/media/platform/soc_camera.c b/trunk/drivers/media/platform/soc_camera.c
index a6d484f38a88..3feb43b4f281 100644
--- a/trunk/drivers/media/platform/soc_camera.c
+++ b/trunk/drivers/media/platform/soc_camera.c
@@ -89,24 +89,30 @@ static int soc_camera_power_off(struct soc_camera_device *icd,
 				struct soc_camera_link *icl)
 {
 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-	int ret = v4l2_subdev_call(sd, core, s_power, 0);
+	int ret = 0;
+	int err;
 
-	if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
-		return ret;
+	err = v4l2_subdev_call(sd, core, s_power, 0);
+	if (err < 0 && err != -ENOIOCTLCMD && err != -ENODEV) {
+		dev_err(icd->pdev, "Subdev failed to power-off the camera.\n");
+		ret = err;
+	}
 
 	if (icl->power) {
-		ret = icl->power(icd->control, 0);
-		if (ret < 0) {
+		err = icl->power(icd->control, 0);
+		if (err < 0) {
 			dev_err(icd->pdev,
 				"Platform failed to power-off the camera.\n");
-			return ret;
+			ret = ret ? : err;
 		}
 	}
 
-	ret = regulator_bulk_disable(icl->num_regulators,
+	err = regulator_bulk_disable(icl->num_regulators,
 				     icl->regulators);
-	if (ret < 0)
+	if (err < 0) {
 		dev_err(icd->pdev, "Cannot disable regulators\n");
+		ret = ret ? : err;
+	}
 
 	return ret;
 }