aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2009-12-01 12:10:34 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-12-03 05:49:55 -0500
commit1bc8079879e8edfff451b62b7550bdd18523f963 (patch)
treeadfd5aee1bd8f951eee2487d5fd274be212ee968
parenta649d1fcc9bd2299cb06b6594fabb429fa50f174 (diff)
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>
-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 fe9f4657c959..2ca33b09a867 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -488,11 +488,8 @@ EXPORT_SYMBOL_GPL(au1xpsc_pcm_add);
488 488
489void au1xpsc_pcm_destroy(struct platform_device *dmapd) 489void au1xpsc_pcm_destroy(struct platform_device *dmapd)
490{ 490{
491 if (dmapd) { 491 if (dmapd)
492 kfree(dmapd->resource);
493 dmapd->resource = NULL;
494 platform_device_unregister(dmapd); 492 platform_device_unregister(dmapd);
495 }
496} 493}
497EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy); 494EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy);
498 495