From 1a5228b835b3a6832bf4ac0fd9d158472c51e2fd Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 5 Jul 2012 20:35:29 +0100
Subject: [PATCH] --- yaml --- r: 319741 b: refs/heads/master c:
 5879f5710e684af662635770561112ce3f25ea8c h: refs/heads/master i:   319739:
 41aa420a948f417b4e76760f52b3c111c6088f93 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/arizona-core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b6f5d72abe36..494cf8aaee5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de2233365d5abc94993378330768786de2c606f6
+refs/heads/master: 5879f5710e684af662635770561112ce3f25ea8c
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index c8946a889a78..e1308b5214ba 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -232,8 +232,10 @@ static int arizona_runtime_resume(struct device *dev)
 	regcache_cache_only(arizona->regmap, false);
 
 	ret = arizona_wait_for_boot(arizona);
-	if (ret != 0)
+	if (ret != 0) {
+		regulator_disable(arizona->dcvdd);
 		return ret;
+	}
 
 	regcache_sync(arizona->regmap);