From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 5 Jul 2012 19:35:29 +0000 (+0100)
Subject: mfd: Release arizona DCVDD if we fail to resume the device
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5879f5710e684af662635770561112ce3f25ea8c;p=openwrt%2Fstaging%2Fblogic.git

mfd: Release arizona DCVDD if we fail to resume the device

Ensures we don't leak the enable we just did.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index c8946a889a78..e1308b5214ba 100644
--- a/drivers/mfd/arizona-core.c
+++ b/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);