From f35f2d69972f2646060b37ff08bcf944311e22e2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 4 Jan 2013 17:16:12 +0000
Subject: [PATCH] --- yaml --- r: 349305 b: refs/heads/master c:
 9270bdf5405668ca5d75ace1d7872e2762162c47 h: refs/heads/master i:   349303:
 c89adc3fbf53c9b9b5037574b034c28e755c443d v: v3

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

diff --git a/[refs] b/[refs]
index 12673901a08b..c7da91d7bc57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f0529b4d80ad02df637be67ed4f82e93b8db32f
+refs/heads/master: 9270bdf5405668ca5d75ace1d7872e2762162c47
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index bc8a3edb6bbf..222c03a5ddc0 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -239,7 +239,12 @@ static int arizona_runtime_resume(struct device *dev)
 		return ret;
 	}
 
-	regcache_sync(arizona->regmap);
+	ret = regcache_sync(arizona->regmap);
+	if (ret != 0) {
+		dev_err(arizona->dev, "Failed to restore register cache\n");
+		regulator_disable(arizona->dcvdd);
+		return ret;
+	}
 
 	return 0;
 }