diff options
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.11/0001-Revert-mfd-Test-for-jack-detection-when-deciding-if-.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.11/0001-Revert-mfd-Test-for-jack-detection-when-deciding-if-.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.11/0001-Revert-mfd-Test-for-jack-detection-when-deciding-if-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.11/0001-Revert-mfd-Test-for-jack-detection-when-deciding-if-.patch new file mode 100644 index 00000000..df713dcd --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.11/0001-Revert-mfd-Test-for-jack-detection-when-deciding-if-.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 75d6feb2330ece547d401da6dd6f812a75728d78 Mon Sep 17 00:00:00 2001 | ||
2 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
3 | Date: Tue, 13 Mar 2012 09:36:07 -0700 | ||
4 | Subject: [PATCH 1/2] Revert "mfd: Test for jack detection when deciding if | ||
5 | wm8994 should suspend" | ||
6 | |||
7 | This reverts commit 315e73b400c9a287a53efb5f857d308589674ac5 as it | ||
8 | breaks the 3.2-stable build. | ||
9 | |||
10 | Reported-by: Ben Guthro <ben@guthro.net> | ||
11 | Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
12 | Cc: Samuel Ortiz <sameo@linux.intel.com> | ||
13 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
14 | --- | ||
15 | drivers/mfd/wm8994-core.c | 14 -------------- | ||
16 | 1 file changed, 14 deletions(-) | ||
17 | |||
18 | diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c | ||
19 | index 9302d21..61894fc 100644 | ||
20 | --- a/drivers/mfd/wm8994-core.c | ||
21 | +++ b/drivers/mfd/wm8994-core.c | ||
22 | @@ -252,20 +252,6 @@ static int wm8994_suspend(struct device *dev) | ||
23 | break; | ||
24 | } | ||
25 | |||
26 | - switch (wm8994->type) { | ||
27 | - case WM1811: | ||
28 | - ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2); | ||
29 | - if (ret < 0) { | ||
30 | - dev_err(dev, "Failed to read jackdet: %d\n", ret); | ||
31 | - } else if (ret & WM1811_JACKDET_MODE_MASK) { | ||
32 | - dev_dbg(dev, "CODEC still active, ignoring suspend\n"); | ||
33 | - return 0; | ||
34 | - } | ||
35 | - break; | ||
36 | - default: | ||
37 | - break; | ||
38 | - } | ||
39 | - | ||
40 | /* Disable LDO pulldowns while the device is suspended if we | ||
41 | * don't know that something will be driving them. */ | ||
42 | if (!wm8994->ldo_ena_always_driven) | ||
43 | -- | ||
44 | 1.7.9.4 | ||
45 | |||