diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
| commit | bd842b53fada517017d192c8a12fc9a38e6250e1 (patch) | |
| tree | 57399eb06aba47199535f8a5d42023465eb5001f /drivers/mfd | |
| parent | 5a5f348ffc433c0483b5c13ebefe73adb5e68f2b (diff) | |
| parent | d77cf23f1befd3922d81b91cb01fd3da619e0206 (diff) | |
Merge commit 'v2.6.36.3' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 1e7aaaf6cc6f..b5347167aa72 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c @@ -1464,7 +1464,11 @@ static 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; @@ -1617,7 +1621,7 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) case WM8321: ret = mfd_add_devices(wm831x->dev, -1, wm8320_devs, ARRAY_SIZE(wm8320_devs), - NULL, 0); + NULL, wm831x->irq_base); break; default: |