| From 9d51a6b2487724e8713cd2794cf09ffeee5f6932 Mon Sep 17 00:00:00 2001 |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| Date: Tue, 20 Jul 2010 13:24:33 -0700 |
| Subject: sdhci-s3c: add missing remove function |
| |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| |
| commit 9d51a6b2487724e8713cd2794cf09ffeee5f6932 upstream. |
| |
| System will crash sooner or later once the memory with the code of the |
| s3c-sdhci.ko module is reused for something else. I really have no idea |
| how the lack of remove function went unnoticed into the mainline code. |
| |
| Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/mmc/host/sdhci-s3c.c | 20 ++++++++++++++++++++ |
| 1 file changed, 20 insertions(+) |
| |
| --- a/drivers/mmc/host/sdhci-s3c.c |
| +++ b/drivers/mmc/host/sdhci-s3c.c |
| @@ -372,6 +372,26 @@ static int __devinit sdhci_s3c_probe(str |
| |
| static int __devexit sdhci_s3c_remove(struct platform_device *pdev) |
| { |
| + struct sdhci_host *host = platform_get_drvdata(pdev); |
| + struct sdhci_s3c *sc = sdhci_priv(host); |
| + int ptr; |
| + |
| + sdhci_remove_host(host, 1); |
| + |
| + for (ptr = 0; ptr < 3; ptr++) { |
| + clk_disable(sc->clk_bus[ptr]); |
| + clk_put(sc->clk_bus[ptr]); |
| + } |
| + clk_disable(sc->clk_io); |
| + clk_put(sc->clk_io); |
| + |
| + iounmap(host->ioaddr); |
| + release_resource(sc->ioarea); |
| + kfree(sc->ioarea); |
| + |
| + sdhci_free_host(host); |
| + platform_set_drvdata(pdev, NULL); |
| + |
| return 0; |
| } |
| |