Merge branch 'for-3.1' into for-3.2 (60c9e317) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/soc/codecs/ssm2602.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,8 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,
		static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
		enum snd_soc_bias_level level)
		{
		u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;
		u16 reg = snd_soc_read(codec, SSM2602_PWR);
		reg &= ~(PWR_POWER_OFF \| PWR_OSC_PDN);

		switch (level) {
		case SND_SOC_BIAS_ON: