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

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

Merge branch 'for-2.6.39' into for-2.6.40

parents b7a5d14c 1fdf9b49

sound/soc/codecs/jz4740.c

+0 −2
Original line number Diff line number Diff line
@@ -308,8 +308,6 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec) 
	snd_soc_dapm_add_routes(dapm, jz4740_codec_dapm_routes,

		ARRAY_SIZE(jz4740_codec_dapm_routes));



	snd_soc_dapm_new_widgets(codec);



	jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;