Skip to contentSkip to conversation

mfd: Update wm8994 active device checks for WM1811

PATCH Applied Mark Brown 2 participants 2 messages Nov 4, 2011 – Nov 14, 2011

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 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.

---

This really should go into 3.2 to ensure suspend works in all situations on WM1811 - all the dependencies are now in Linus' tree.

 drivers/mfd/wm8994-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mfd/wm8994-core.c +1 -0
index 5d6ba13..61894fc 100644
@@ -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);
Signature · 1 line
1.7.7.1
Applied
#1 lore raw

Hi Mark,

Quoted 2 lines · Mark Brown

This didn't go in as part of the original MFD patch for WM1811 due to cross tree issues.

I applied this one to my for-linus branch. It should make it to 3.2.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/