Annotation of /trunk/kernel-magellan/patches-3.2/0110-3.2.11-all-fixes.patch
Parent Directory
| 
Revision Log
Revision 1704 -
(hide annotations)
(download)
Fri Mar 16 08:52:00 2012 UTC (12 years, 1 month ago) by niro
File size: 731 byte(s)
Fri Mar 16 08:52:00 2012 UTC (12 years, 1 month ago) by niro
File size: 731 byte(s)
-updated to linux-3.2.11
| 1 | niro | 1704 | 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) |