diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-18 19:32:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-19 10:17:26 +0100 |
| commit | d1e81428826221d7ff8e4d83db784d099cd232a7 (patch) | |
| tree | 83bcd0aa3a4cea80d090bcc7fffc6d7a01387fe2 /sound/soc/soc-core.c | |
| parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
| download | linux-stable-d1e81428826221d7ff8e4d83db784d099cd232a7.tar.gz linux-stable-d1e81428826221d7ff8e4d83db784d099cd232a7.tar.bz2 linux-stable-d1e81428826221d7ff8e4d83db784d099cd232a7.zip | |
ASoC: core: Clean up DAPM before the card debugfs
Both the card and DAPM cleanups recursively delete their debugfs
directories. Since the DAPM debugfs subdirectory for the card is
located within the card debugfs this means we end up trying to double
free the DAPM subdirectory. Reorder the cleanup to free the card
debugfs after we've cleaned up DAPM and it has deleted its own
subdirectory.
Reported-by: Russell King - ARM Linux <linux@armlinux.org.uk>
Tested-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16369cad4803..66a33f1e4881 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2083,14 +2083,13 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) /* remove auxiliary devices */ soc_remove_aux_devices(card); + snd_soc_dapm_free(&card->dapm); soc_cleanup_card_debugfs(card); /* remove the card */ if (card->remove) card->remove(card); - snd_soc_dapm_free(&card->dapm); - snd_card_free(card->snd_card); return 0; |