mfd: wm8994: Remove duplicate check for active JACKDET
Subsystems (2)
PATCH 1/1 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(-)
drivers/mfd/wm8994-core.c +0 -14
@@ -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)
Signature · 1 line
1.8.3.1
Samuel Ortiz
AppliedHi Mark,
Quoted 9 lines · Mark Brown
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.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/