2013-07-01 19:56:52

by Mark Brown

Subject: [PATCH] mfd: wm8994: Remove duplicate check for active JACKDET

From: Mark Brown <[email protected]>

Probably the result of a mismerge or rebase failing to notice that the
hunk had already been applied.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/wm8994-core.c | 14 --------------
1 file changed, 14 deletions(-)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index ccdddf9..781115e 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)
--
1.8.3.1

2013-07-01 23:00:26

by Samuel Ortiz

Subject: Re: [PATCH] mfd: wm8994: Remove duplicate check for active JACKDET

Hi Mark,

On Mon, Jul 01, 2013 at 08:56:18PM +0100, Mark Brown wrote:
> From: Mark Brown <[email protected]>
>
> Probably the result of a mismerge or rebase failing to notice that the
> hunk had already been applied.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/mfd/wm8994-core.c | 14 --------------
> 1 file changed, 14 deletions(-)
Applied to mfd-next, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/