Messages in this thread Patch in this message | | | Date | Tue, 13 Mar 2012 10:13:44 -0700 | From | Greg KH <> | Subject | Re: Linux 3.2.11 |
| |
diff --git a/Makefile b/Makefile index 1ddd6e9..4b76371 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 10 +SUBLEVEL = 11 EXTRAVERSION = NAME = Saber-toothed Squirrel diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 9302d21..61894fc 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -252,20 +252,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)
| |