Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e66ef2f8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 474b62d6 78b3fb46

sound/soc/codecs/wm8994.c

+1 −1
Original line number Diff line number Diff line
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate) 
	else

		val = 0;



	return snd_soc_update_bits(codec, reg, mask, reg);

	return snd_soc_update_bits(codec, reg, mask, val);

}



#define WM8994_RATES SNDRV_PCM_RATE_8000_96000

sound/soc/codecs/wm8995.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate) 
	else

		val = 0;



	return snd_soc_update_bits(codec, reg, mask, reg);

	return snd_soc_update_bits(codec, reg, mask, val);

}



/* The size in bits of the FLL divide multiplied by 10