From a1b787cebe3ef14aac8cf0b96741a95abc1e215f Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 1 Aug 2012 09:15:11 +0800
Subject: [PATCH] --- yaml --- r: 323335 b: refs/heads/master c:
 4001376ef2f6f4ec0f362566d95937434afa07ba h: refs/heads/master i:   323333:
 c41e8b4e684b62290b037494c25e19d548a7fa90   323331:
 f1162ee186da47590a0576172cf9e7a26ee372c6   323327:
 cf682e1ec33749ae4707b9726f17f6cfca69a240 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/regulator/wm8400-regulator.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7e626c275c81..e2e78fdef1e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363506cd71a5cafeee67b236112f1baf8c30b0ea
+refs/heads/master: 4001376ef2f6f4ec0f362566d95937434afa07ba
diff --git a/trunk/drivers/regulator/wm8400-regulator.c b/trunk/drivers/regulator/wm8400-regulator.c
index 9035dd053611..27c746ef0636 100644
--- a/trunk/drivers/regulator/wm8400-regulator.c
+++ b/trunk/drivers/regulator/wm8400-regulator.c
@@ -120,13 +120,8 @@ static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)
 
 	case REGULATOR_MODE_IDLE:
 		/* Datasheet: standby */
-		ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
-				      WM8400_DC1_ACTIVE, 0);
-		if (ret != 0)
-			return ret;
 		return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
-				       WM8400_DC1_SLEEP, 0);
-
+				       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, 0);
 	default:
 		return -EINVAL;
 	}