aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-04-30 13:45:47 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-03 13:43:15 -0400
commit0aaae527c71e6af571093d90474f37c8662008d5 (patch)
tree68f2d50a0d094c258c8b210330bf90c9e64ed31b /sound
parent1307394afd2d6cf8f41f5e691b43ffc9e027630c (diff)
ASoC: Free the card's DAPM context
Free the card's DAPM context when the card is removed. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a823654ef367..6a3cb53185cb 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2047,6 +2047,8 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
2047 if (card->remove) 2047 if (card->remove)
2048 card->remove(card); 2048 card->remove(card);
2049 2049
2050 snd_soc_dapm_free(&card->dapm);
2051
2050 kfree(card->rtd); 2052 kfree(card->rtd);
2051 snd_card_free(card->snd_card); 2053 snd_card_free(card->snd_card);
2052 return 0; 2054 return 0;