diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 06:57:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 06:57:43 -0500 |
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: | |||
384 | 384 | ||
385 | static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) | 385 | static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) |
386 | { | 386 | { |
387 | |||
388 | snd_soc_unregister_dai(&pdev->dev); | 387 | snd_soc_unregister_dai(&pdev->dev); |
389 | 388 | ||
390 | clk_put(nuc900_ac97_data->clk); | 389 | clk_put(nuc900_ac97_data->clk); |
@@ -392,6 +391,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) | |||
392 | release_mem_region(nuc900_ac97_data->res->start, | 391 | release_mem_region(nuc900_ac97_data->res->start, |
393 | resource_size(nuc900_ac97_data->res)); | 392 | resource_size(nuc900_ac97_data->res)); |
394 | 393 | ||
394 | kfree(nuc900_ac97_data); | ||
395 | nuc900_ac97_data = NULL; | 395 | nuc900_ac97_data = NULL; |
396 | 396 | ||
397 | return 0; | 397 | return 0; |