mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-12 04:19:08 +00:00
Merge branch 'for-2.6.39' into for-2.6.40
This commit is contained in:
commit
ec5af076f5
@ -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,
|
snd_soc_dapm_add_routes(dapm, jz4740_codec_dapm_routes,
|
||||||
ARRAY_SIZE(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);
|
jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user