mfd: wm8994: Remove duplicate check for active JACKDET
authorMark Brown <broonie@linaro.org>
Mon, 1 Jul 2013 19:56:18 +0000 (20:56 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 1 Jul 2013 22:54:39 +0000 (00:54 +0200)
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>
drivers/mfd/wm8994-core.c

index ccdddf9190694ab18613a43ed11b54f33620762e..781115e8dca90823bbae297ab4eadc9ff63fa791 100644 (file)
@@ -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)