Merge branch 'for-2.6.31' into for-2.6.32

2009-06-25 13:58:37 +01:00
parent e2f551dacb dd5e8e6b1d
commit d5fc3b5fe3
8 changed files with 30 additions and 20 deletions
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1444,6 +1444,9 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
 	snprintf(codec->card->longname, sizeof(codec->card->longname),
 		 "%s (%s)", card->name, codec->name);

+	/* Make sure all DAPM widgets are instantiated */
+	snd_soc_dapm_new_widgets(codec);
+
 	ret = snd_card_register(codec->card);
 	if (ret < 0) {
 		printk(KERN_ERR "asoc: failed to register soundcard for %s\n",