summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-01 23:56:18 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-07-02 02:54:39 +0400
commitda002d8924a49e8d8e289d07d46339e12dd56899 (patch)
treec15f02041d0dcfe00bc2950273f180f284cb1cd5 /drivers/mfd
parent55b5940df9cefcd5cf1ba4b4f538b303b725b546 (diff)
downloadlinux-da002d8924a49e8d8e289d07d46339e12dd56899.tar.xz
mfd: wm8994: Remove duplicate check for active JACKDET
Probably the result of a mismerge or rebase failing to notice that the hunk had already been applied. Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-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 ccdddf919069..781115e8dca9 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -259,20 +259,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)