diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-01 15:56:18 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-07-01 18:54:39 -0400 |
commit | da002d8924a49e8d8e289d07d46339e12dd56899 (patch) | |
tree | c15f02041d0dcfe00bc2950273f180f284cb1cd5 | |
parent | 55b5940df9cefcd5cf1ba4b4f538b303b725b546 (diff) |
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>
-rw-r--r-- | drivers/mfd/wm8994-core.c | 14 |
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) | |||
259 | break; | 259 | break; |
260 | } | 260 | } |
261 | 261 | ||
262 | switch (wm8994->type) { | ||
263 | case WM1811: | ||
264 | ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2); | ||
265 | if (ret < 0) { | ||
266 | dev_err(dev, "Failed to read jackdet: %d\n", ret); | ||
267 | } else if (ret & WM1811_JACKDET_MODE_MASK) { | ||
268 | dev_dbg(dev, "CODEC still active, ignoring suspend\n"); | ||
269 | return 0; | ||
270 | } | ||
271 | break; | ||
272 | default: | ||
273 | break; | ||
274 | } | ||
275 | |||
276 | /* Disable LDO pulldowns while the device is suspended if we | 262 | /* Disable LDO pulldowns while the device is suspended if we |
277 | * don't know that something will be driving them. */ | 263 | * don't know that something will be driving them. */ |
278 | if (!wm8994->ldo_ena_always_driven) | 264 | if (!wm8994->ldo_ena_always_driven) |