kernel-magellan/patches-3.2/0110-3.2.11-all-fixes.patch

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)
1	diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
2	index 9302d21..61894fc 100644
3	--- a/drivers/mfd/wm8994-core.c
4	+++ b/drivers/mfd/wm8994-core.c
5	@@ -252,20 +252,6 @@ static int wm8994_suspend(struct device *dev)
6	break;
7	}
8
9	- switch (wm8994->type) {
10	- case WM1811:
11	- ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
12	- if (ret < 0) {
13	- dev_err(dev, "Failed to read jackdet: %d\n", ret);
14	- } else if (ret & WM1811_JACKDET_MODE_MASK) {
15	- dev_dbg(dev, "CODEC still active, ignoring suspend\n");
16	- return 0;
17	- }
18	- break;
19	- default:
20	- break;
21	- }
22	-
23	/* Disable LDO pulldowns while the device is suspended if we
24	* don't know that something will be driving them. */
25	if (!wm8994->ldo_ena_always_driven)