diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 11:57:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 11:57:43 +0000 |
| commit | ab4e57446ff2e0a5c154cb703595d574130dc919 (patch) | |
| tree | 2527773606a07b3f7af0bd2c0e6f692d1f340d32 /sound/soc/nuc900 | |
| parent | 2a9ae13a2641373d06e24f866c7427644c39bfea (diff) | |
| parent | d6f443ae4c1d54379ad5953d7bcb89a63387184d (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/nuc900')
| -rw-r--r-- | sound/soc/nuc900/nuc900-ac97.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 293dc748797c..e00e39dd6576 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -384,7 +384,6 @@ out0: static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); clk_put(nuc900_ac97_data->clk); @@ -392,6 +391,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) release_mem_region(nuc900_ac97_data->res->start, resource_size(nuc900_ac97_data->res)); + kfree(nuc900_ac97_data); nuc900_ac97_data = NULL; return 0; |