aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-13 09:36:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-13 09:36:07 -0700
commitf26a76724b92c9f6d5dfe2e10570367e19d06dda (patch)
tree83b1e71922c9348cbfbbff0fcd42567c62e3a9d9
parent7459f116851565dffa17d8db43f37b693bd97b6a (diff)
Revert "mfd: Test for jack detection when deciding if wm8994 should suspend"
This reverts commit 315e73b400c9a287a53efb5f857d308589674ac5 as it breaks the 3.2-stable build. Reported-by: Ben Guthro <ben@guthro.net> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mfd/wm8994-core.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 9302d21d764..61894fced8e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -252,20 +252,6 @@ static int wm8994_suspend(struct device *dev)
break;
}
- switch (wm8994->type) {
- case WM1811:
- ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
- if (ret < 0) {
- dev_err(dev, "Failed to read jackdet: %d\n", ret);
- } else if (ret & WM1811_JACKDET_MODE_MASK) {
- dev_dbg(dev, "CODEC still active, ignoring suspend\n");
- return 0;
- }
- break;
- default:
- break;
- }
-
/* Disable LDO pulldowns while the device is suspended if we
* don't know that something will be driving them. */
if (!wm8994->ldo_ena_always_driven)