From ed1f1c91b49a94334a24062031ef32e79924af0b Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 2 Jun 2011 19:18:55 +0100
Subject: [PATCH] --- yaml --- r: 261863 b: refs/heads/master c:
 a2495bc727e2dd8421fb85c80e38f9a4a4c1e58e h: refs/heads/master i:   261861:
 d4b4545003e08711e68955e7a0fcc0e95f3274c4   261859:
 ab7621a6d7b5dfd21c8fd967a23dae8f6e407ff7   261855:
 309c8c5331eba8c9fc8b0e239f4a5966739af63a v: v3

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

diff --git a/[refs] b/[refs]
index 8ff21b2f3d81..529c41e8e071 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1738aef387ab9591a6d13b00945e248b942c53f
+refs/heads/master: a2495bc727e2dd8421fb85c80e38f9a4a4c1e58e
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
index e198d40292e7..18f19b7198a0 100644
--- a/trunk/drivers/mfd/wm8994-core.c
+++ b/trunk/drivers/mfd/wm8994-core.c
@@ -476,13 +476,18 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 		goto err_enable;
 	}
 
-	switch (ret) {
-	case 0:
-	case 1:
-		if (wm8994->type == WM8994)
+	switch (wm8994->type) {
+	case WM8994:
+		switch (ret) {
+		case 0:
+		case 1:
 			dev_warn(wm8994->dev,
 				 "revision %c not fully supported\n",
 				 'A' + ret);
+			break;
+		default:
+			break;
+		}
 		break;
 	default:
 		break;