From aa0495a246e212c48de31054ae7b24e5a2d645c1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 3 Oct 2011 20:17:16 +0800 Subject: [PATCH] --- yaml --- r: 270734 b: refs/heads/master c: 43419b80fa46ee94d4b50ac6ebb1ee1ca5bbbcc7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/sn95031.c | 1 - trunk/sound/soc/codecs/wm5100.c | 2 -- trunk/sound/soc/codecs/wm8996.c | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a18c1687f87f..a775e9f85411 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca7aceef21f2689d0b0e92aa4f316959f7931c25 +refs/heads/master: 43419b80fa46ee94d4b50ac6ebb1ee1ca5bbbcc7 diff --git a/trunk/sound/soc/codecs/sn95031.c b/trunk/sound/soc/codecs/sn95031.c index 5c5a4abfc001..f681e41fc12e 100644 --- a/trunk/sound/soc/codecs/sn95031.c +++ b/trunk/sound/soc/codecs/sn95031.c @@ -826,7 +826,6 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) { pr_debug("codec_probe called\n"); - codec->dapm.bias_level = SND_SOC_BIAS_OFF; codec->dapm.idle_bias_off = 1; /* PCM interface config diff --git a/trunk/sound/soc/codecs/wm5100.c b/trunk/sound/soc/codecs/wm5100.c index f6039890edfd..46afdf86f592 100644 --- a/trunk/sound/soc/codecs/wm5100.c +++ b/trunk/sound/soc/codecs/wm5100.c @@ -2285,8 +2285,6 @@ static int wm5100_probe(struct snd_soc_codec *codec) wm5100->codec = codec; - codec->dapm.bias_level = SND_SOC_BIAS_OFF; - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_I2C); if (ret != 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c index b98a8f8525d9..43e46c7f9b0e 100644 --- a/trunk/sound/soc/codecs/wm8996.c +++ b/trunk/sound/soc/codecs/wm8996.c @@ -2706,7 +2706,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) init_completion(&wm8996->fll_lock); dapm->idle_bias_off = true; - dapm->bias_level = SND_SOC_BIAS_OFF; ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_I2C); if (ret != 0) {