---

yaml --- r: 223521 b: refs/heads/master c: b93cef5 h: refs/heads/master i: 223519: 9f45a61 v: v3
git-mirror · Dec 22, 2010 · 86bc442 · 86bc442
1 parent 9ca1215
commit 86bc442
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;