Skip to contentSkip to conversation

omap: McBSP: Fix potential memory leak in omap_mcbsp_remove

PATCH In review Jarkko Nikula 2 participants 2 messages Nov 3, 2010 – Nov 16, 2010

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 omap: McBSP: Fix potential memory leak in omap_mcbsp_remove

Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups and clk_disable calls since they are not needed here.

This is not problem currently but becomes if the mcbsp driver is ever modularized.

Signed-off-by Jarkko Nikula <[email protected]>
---
 arch/arm/plat-omap/mcbsp.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
arch/arm/plat-omap/mcbsp.c +1 -7
index eac4b97..f79090c 100644
@@ -1836,17 +1836,11 @@ static int __devexit omap_mcbsp_remove(struct platform_device *pdev)
 
 		omap34xx_device_exit(mcbsp);
 
-		clk_disable(mcbsp->fclk);
-		clk_disable(mcbsp->iclk);
 		clk_put(mcbsp->fclk);
 		clk_put(mcbsp->iclk);
 
 		iounmap(mcbsp->io_base);
-
-		mcbsp->fclk = NULL;
-		mcbsp->iclk = NULL;
-		mcbsp->free = 0;
-		mcbsp->dev = NULL;
+		kfree(mcbsp);
 	}
 
 	return 0;
Signature · 1 line
1.7.2.3
#1 lore raw
Quoted 6 lines · Jarkko Nikula

Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups and clk_disable calls since they are not needed here.

This is not problem currently but becomes if the mcbsp driver is ever modularized.

Queuing this for 2.6.38 merge window.

Tony