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>
This commit is contained in:
parent
55b5940df9
commit
da002d8924
|
@ -259,20 +259,6 @@ static int wm8994_suspend(struct device *dev)
|
||||||
break;
|
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
|
/* Disable LDO pulldowns while the device is suspended if we
|
||||||
* don't know that something will be driving them. */
|
* don't know that something will be driving them. */
|
||||||
if (!wm8994->ldo_ena_always_driven)
|
if (!wm8994->ldo_ena_always_driven)
|
||||||
|
|
Loading…
Reference in New Issue