summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-04 23:14:46 +0000
committerSamuel Ortiz <sameo@linux.intel.com>2011-12-20 18:50:56 +0100
commitb5488b6e868454fb10d23278de5038cda98b13ab (patch)
tree1d6f618150d33f620465e85d610ff77a695a2fac
parent26bc4e0cc5426e86398d6780d160f02c0a347087 (diff)
downloadlinux-3.10-b5488b6e868454fb10d23278de5038cda98b13ab.tar.gz
linux-3.10-b5488b6e868454fb10d23278de5038cda98b13ab.tar.bz2
linux-3.10-b5488b6e868454fb10d23278de5038cda98b13ab.zip
mfd: Update wm8994 active device checks for WM1811
This didn't go in as part of the original MFD patch for WM1811 due to cross tree issues. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/wm8994-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 5d6ba132837..61894fced8e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -239,6 +239,7 @@ static int wm8994_suspend(struct device *dev)
switch (wm8994->type) {
case WM8958:
+ case WM1811:
ret = wm8994_reg_read(wm8994, WM8958_MIC_DETECT_1);
if (ret < 0) {
dev_err(dev, "Failed to read power status: %d\n", ret);