提交 da002d89 编写于 作者: M Mark Brown 提交者: Samuel Ortiz

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: NMark Brown <broonie@linaro.org>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
上级 55b5940d
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册