From a07e0d0a30ec424ed12ecae1d262cf1cb424fd98 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 2 May 2013 16:48:07 +0100 Subject: [PATCH] --- yaml --- r: 375005 b: refs/heads/master c: 27d4cdca7500ddc42002b96c0ea818e6da61ad91 h: refs/heads/master i: 375003: 9ccc3625572059625df5baa4dae0336ae4305e45 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fe2003c16d2..2eb8463724cc 100644 --- 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 index a15dd6b63a8f..3cd555ac6d0a 100644 --- 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)