From 86bc442df18153791add88987d49a05325d17d90 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 2 Dec 2010 16:25:43 +0000
Subject: [PATCH] --- yaml --- r: 223521 b: refs/heads/master c:
 b93cef556162b0f33399bfe5f307c54f51554e09 h: refs/heads/master i:   223519:
 9f45a61e7dc5af142054bc87e252773298a0c6a1 v: v3

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

diff --git a/[refs] b/[refs]
index 9902f53996a3..01fe35cb8066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88aec4f7b67b5889ba5b4beac2d2c1400451c318
+refs/heads/master: b93cef556162b0f33399bfe5f307c54f51554e09
diff --git a/trunk/drivers/mfd/wm831x-core.c b/trunk/drivers/mfd/wm831x-core.c
index e1a2f4b78529..76cadcf3b1fe 100644
--- a/trunk/drivers/mfd/wm831x-core.c
+++ b/trunk/drivers/mfd/wm831x-core.c
@@ -1455,7 +1455,11 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 		dev_err(wm831x->dev, "Failed to read parent ID: %d\n", ret);
 		goto err;
 	}
-	if (ret != 0x6204) {
+	switch (ret) {
+	case 0x6204:
+	case 0x6246:
+		break;
+	default:
 		dev_err(wm831x->dev, "Device is not a WM831x: ID %x\n", ret);
 		ret = -EINVAL;
 		goto err;