Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mark Brown and committed by
Samuel Ortiz
da002d89 55b5940d

-14
-14
drivers/mfd/wm8994-core.c
··· 259 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 262 /* Disable LDO pulldowns while the device is suspended if we 277 263 * don't know that something will be driving them. */ 278 264 if (!wm8994->ldo_ena_always_driven)