summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2009-12-01 18:10:34 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-12-03 10:49:55 +0000
commit1bc8079879e8edfff451b62b7550bdd18523f963 (patch)
treeadfd5aee1bd8f951eee2487d5fd274be212ee968 /sound
parenta649d1fcc9bd2299cb06b6594fabb429fa50f174 (diff)
downloadlinux-3.10-1bc8079879e8edfff451b62b7550bdd18523f963.tar.gz
linux-3.10-1bc8079879e8edfff451b62b7550bdd18523f963.tar.bz2
linux-3.10-1bc8079879e8edfff451b62b7550bdd18523f963.zip
ASoC: au1x: dbdma2: fix oops on soc device removal.
platform_device_unregister() frees resources for us, no need to do it explicitly. Fixes an oops when machine code removes the soc-audio device. Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/au1x/dbdma2.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index fe9f4657c95..2ca33b09a86 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -488,11 +488,8 @@ EXPORT_SYMBOL_GPL(au1xpsc_pcm_add);
void au1xpsc_pcm_destroy(struct platform_device *dmapd)
{
- if (dmapd) {
- kfree(dmapd->resource);
- dmapd->resource = NULL;
+ if (dmapd)
platform_device_unregister(dmapd);
- }
}
EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy);