diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:36 +0200 |
| commit | 21ce3cd63365b0d07794adeb4325944bfa86fb4e (patch) | |
| tree | ce1d29f617d4b67b56649cd9042b920956662bf4 /sound/soc/soc-core.c | |
| parent | e3f86d3d3ce350144562d9bd035dc8a274fce58e (diff) | |
| parent | 33745fb3448f90d2b9e414ccc6689e9ee70cfae4 (diff) | |
Merge branch 'topic/asoc' into for-linus
* topic/asoc:
ASoC: magician: fix PXA SSP clock polarity
ASoC: Instantiate any forgotten DAPM widgets
ASoC: Revert duplicated code in SSM2602 driver
ASoC: Remove odd bit clock ratios for WM8903
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 3f44150d8e3..1d70829464e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1389,6 +1389,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", |