From 9bc71b76e0ed2ee3a69d4db5ab51725dc99bec43 Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jhnikula@gmail.com>
Date: Tue, 7 Dec 2010 16:25:40 -0800
Subject: [PATCH] --- yaml --- r: 226462 b: refs/heads/master c:
 5f3b7284cb35c9e3eead279cb35f017b9735bb43 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/plat-omap/mcbsp.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7333ad129e63..c9d28175b38a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1cc4c55c69efed3ebbb2a13e4c77a2a1a4a6bc9
+refs/heads/master: 5f3b7284cb35c9e3eead279cb35f017b9735bb43
diff --git a/trunk/arch/arm/plat-omap/mcbsp.c b/trunk/arch/arm/plat-omap/mcbsp.c
index eac4b978e9fd..f79090cb823b 100644
--- a/trunk/arch/arm/plat-omap/mcbsp.c
+++ b/trunk/arch/arm/plat-omap/mcbsp.c
@@ -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;