From 8bb7cef45db0c57966f967c3d83a74cdf4e302ea Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 5 Dec 2011 15:17:36 +0000 Subject: [PATCH] --- yaml --- r: 283904 b: refs/heads/master c: 4105ab846ca795f03e63fb7bfacafc4217f48ca8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8994.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2f110f6c6c75..44614a26335e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1aac484f705007caf0d7c256a1a29506600cae3 +refs/heads/master: 4105ab846ca795f03e63fb7bfacafc4217f48ca8 diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c index 02ca2573214d..3eaf56a33964 100644 --- a/trunk/sound/soc/codecs/wm8994.c +++ b/trunk/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;