---

yaml --- r: 375005 b: refs/heads/master c: 27d4cdc h: refs/heads/master i: 375003: 9ccc362 v: v3
git-mirror · May 9, 2013 · a07e0d0 · a07e0d0
1 parent 6f24125
commit a07e0d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c8abcee7e6c0828c9c76114e11e31fbcaec4e9
+refs/heads/master: 27d4cdca7500ddc42002b96c0ea818e6da61ad91
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -403,8 +403,8 @@ static int mop500_prox_activate(struct device *dev)
 			"no regulator\n");
 		return PTR_ERR(prox_regulator);
 	}
-	regulator_enable(prox_regulator);
-	return 0;
+
+	return regulator_enable(prox_regulator);
 }
 
 static void mop500_prox_deactivate(struct device *dev)