From b2f6a14b60a12c9fcb47398123cabe647839e587 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 27 May 2011 16:54:05 +0200
Subject: [PATCH] --- yaml --- r: 254082 b: refs/heads/master c:
 742a0c7cae9bd0f913c71722289b8ec862d70a2b h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/mmc/host/sh_mobile_sdhi.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 053c986489ed..af3540dac6df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9c350a0a9d3564d20f5301f472b8841f8934c7d
+refs/heads/master: 742a0c7cae9bd0f913c71722289b8ec862d70a2b
diff --git a/trunk/drivers/mmc/host/sh_mobile_sdhi.c b/trunk/drivers/mmc/host/sh_mobile_sdhi.c
index b3654293017b..2353bb797d6c 100644
--- a/trunk/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/trunk/drivers/mmc/host/sh_mobile_sdhi.c
@@ -165,13 +165,14 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
 
 	p->pdata = NULL;
 
+	tmio_mmc_host_remove(host);
+
 	for (i = 0; i < 3; i++) {
 		irq = platform_get_irq(pdev, i);
 		if (irq >= 0)
 			free_irq(irq, host);
 	}
 
-	tmio_mmc_host_remove(host);
 	clk_disable(priv->clk);
 	clk_put(priv->clk);
 	kfree(priv);