From b4da69f26ff59a490bbb112a506669cae1eb0156 Mon Sep 17 00:00:00 2001
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Wed, 27 Mar 2013 09:49:40 +0000
Subject: [PATCH] --- yaml --- r: 373198 b: refs/heads/master c:
 12bb68ed459e52187c7e70cb6dd4bfcc672cc171 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8286fe700bb9..efcbe9a1a621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80436bbb241abbf2168c65622fb98d9378432fa
+refs/heads/master: 12bb68ed459e52187c7e70cb6dd4bfcc672cc171
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index d6b40df64c4a..7d1abe7ce83f 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -342,11 +342,6 @@ static int arizona_runtime_resume(struct device *dev)
 
 	regcache_cache_only(arizona->regmap, false);
 
-	ret = arizona_wait_for_boot(arizona);
-	if (ret != 0) {
-		goto err;
-	}
-
 	switch (arizona->type) {
 	case WM5102:
 		ret = wm5102_patch(arizona);
@@ -365,6 +360,11 @@ static int arizona_runtime_resume(struct device *dev)
 		}
 		break;
 	default:
+		ret = arizona_wait_for_boot(arizona);
+		if (ret != 0) {
+			goto err;
+		}
+
 		break;
 	}