summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-09-27 11:08:47 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-27 11:21:40 +0100
commita9d1974ea13b361bf60a9d493a6a05e5a42b0ba2 (patch)
tree2657b0722b8e2fa342deb110f0e8d721f892fe5f
parentd1b73287c2710f3b76f6980daa88cc719d11034f (diff)
downloadlinux-stable-a9d1974ea13b361bf60a9d493a6a05e5a42b0ba2.tar.gz
linux-stable-a9d1974ea13b361bf60a9d493a6a05e5a42b0ba2.tar.bz2
linux-stable-a9d1974ea13b361bf60a9d493a6a05e5a42b0ba2.zip
ASoC: ssm2602: Set initial bias level to standby
Set the initial bias level to standby during CODEC probe instead of leaving the CODEC powered off. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/ssm2602.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 32d6c5141860..c9e0fdbf0565 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -577,7 +577,12 @@ static int ssm260x_probe(struct snd_soc_codec *codec)
break;
}
- return ret;
+ if (ret)
+ return ret;
+
+ ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
+ return 0;
}
/* remove everything here */