diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-23 18:39:47 +0200 |
| commit | cff7873554eedc044029c41a9fd694245d97eff8 (patch) | |
| tree | 453024605141ed884277e40d55f2b7e62b5b919c /sound/soc/soc-core.c | |
| parent | 5ac57550f279c3d991ef0b398681bcaca18169f7 (diff) | |
| parent | 1a38336b8611a04f0a624330c1f815421f4bf5f4 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: updates for 3.4
Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it. The WM8994 fix is driver specific but
pretty important for that driver.
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8d2ebf502df4..3a4e93e52b6d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3119,6 +3119,7 @@ int snd_soc_register_card(struct snd_soc_card *card) GFP_KERNEL); if (card->rtd == NULL) return -ENOMEM; + card->num_rtd = 0; card->rtd_aux = &card->rtd[card->num_links]; for (i = 0; i < card->num_links; i++) |