summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 15:17:36 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-08 09:22:48 +0800
commit4105ab846ca795f03e63fb7bfacafc4217f48ca8 (patch)
tree5a13bc6743c9a6c3a5db04aaf00b42acc1ff43a6 /sound/soc
parentf1aac484f705007caf0d7c256a1a29506600cae3 (diff)
downloadop-kernel-dev-4105ab846ca795f03e63fb7bfacafc4217f48ca8.zip
op-kernel-dev-4105ab846ca795f03e63fb7bfacafc4217f48ca8.tar.gz
ASoC: Rely on core enabling the wm8994 with runtime PM
No need to do this in the driver now. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8994.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 02ca257..3eaf56a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2188,8 +2188,6 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_STANDBY:
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
- pm_runtime_get_sync(codec->dev);
-
switch (control->type) {
case WM8994:
if (wm8994->revision < 4) {
@@ -2256,11 +2254,8 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
break;
case SND_SOC_BIAS_OFF:
- if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
+ if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
wm8994->cur_fw = NULL;
-
- pm_runtime_put(codec->dev);
- }
break;
}
codec->dapm.bias_level = level;
OpenPOWER on IntegriCloud