---

yaml --- r: 319741 b: refs/heads/master c: 5879f57 h: refs/heads/master i: 319739: 41aa420 v: v3
git-mirror · Jul 8, 2012 · 1a5228b · 1a5228b
1 parent f8d562c
commit 1a5228b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);