On Wed, 17 Jul 2013, 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(-) > > diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c > index 781115e..e8ecb8e 100644 > --- a/drivers/mfd/wm8994-core.c > +++ b/drivers/mfd/wm8994-core.c > @@ -245,20 +245,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)
I don't see the duplicate? -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
