diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 16:58:37 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 16:58:37 +0400 |
| commit | d5fc3b5fe374f24b6773c22e90ef4bdda718b845 (patch) | |
| tree | 3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6 /sound/soc/soc-core.c | |
| parent | e2f551dacbdff8e40365a989ab66104b03316f4d (diff) | |
| parent | dd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff) | |
| download | linux-d5fc3b5fe374f24b6773c22e90ef4bdda718b845.tar.xz | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 55d45c43ba16..235503230fe7 100644 --- 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", |