diff --git a/[refs] b/[refs] index 55ccf6d81e8d..e049e54ab3b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1b73287c2710f3b76f6980daa88cc719d11034f +refs/heads/master: a9d1974ea13b361bf60a9d493a6a05e5a42b0ba2 diff --git a/trunk/sound/soc/codecs/ssm2602.c b/trunk/sound/soc/codecs/ssm2602.c index 32d6c5141860..c9e0fdbf0565 100644 --- a/trunk/sound/soc/codecs/ssm2602.c +++ b/trunk/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 */