projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26bc4e0
)
mfd: Update wm8994 active device checks for WM1811
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Fri, 4 Nov 2011 23:14:46 +0000
(23:14 +0000)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 20 Dec 2011 17:50:56 +0000
(18:50 +0100)
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>
drivers/mfd/wm8994-core.c
patch
|
blob
|
history
diff --git
a/drivers/mfd/wm8994-core.c
b/drivers/mfd/wm8994-core.c
index 5d6ba132837e8efb5f470d48784d5bb5f9809509..61894fced8ea281570bf80320fd593efa0d25740 100644
(file)
--- 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);