[PATCH 2/6] mfd: arizona: Release DCVDD if we fail to resume the device

From: Mark Brown
Date: Thu Jul 05 2012 - 15:36:47 EST


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

Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
drivers/mfd/arizona-core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index d5ef6fa..2ca43a0 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);

--
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/