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

Commit 97884b7a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents 06c6f4d3 2062ea52

sound/soc/codecs/wm8731.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int wm8731_probe(struct snd_soc_codec *codec) 
	snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0);



	/* Disable bypass path by default */

	snd_soc_update_bits(codec, WM8731_APANA, 0x4, 0);

	snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0);



	snd_soc_add_controls(codec, wm8731_snd_controls,

			     ARRAY_SIZE(wm8731_snd_controls));