diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 20:53:36 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 20:53:36 (GMT) |
commit | 9278e634b4e063f415b46923a9ca4e74f42ec932 (patch) | |
tree | ae5c5eef151bbfef5135a5cb04c23113d2f16fc8 /sound/soc/soc-core.c | |
parent | d71f5be276bf79eda14c40f3cafcf827326f10cb (diff) | |
parent | 986b2f2c21b308e21160a40359b81370f8fee6ec (diff) | |
download | linux-fsl-qoriq-9278e634b4e063f415b46923a9ca4e74f42ec932.tar.xz |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: Wait for WM8993 FLL to stabilise
ASoC: core - Free platform DAPM context at platform removal.
ASoC: dapm - Fix check for codec context in dapm_power_widgets().
ASoC: sgtl5000: update author email address
ASoC: Fix DMA channel leak in imx-pcm-dma-mx2 driver.
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3986520..b5ecf6d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -907,6 +907,10 @@ static void soc_remove_dai_link(struct snd_soc_card *card, int num, int order) if (err < 0) printk(KERN_ERR "asoc: failed to remove %s\n", platform->name); } + + /* Make sure all DAPM widgets are freed */ + snd_soc_dapm_free(&platform->dapm); + platform->probed = 0; list_del(&platform->card_list); module_put(platform->dev->driver->owner); |