diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
| commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
| tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /drivers/mmc | |
| parent | spi/mpc5121: change annotations for probe and remove functions (diff) | |
| parent | Linux 2.6.35-rc6 (diff) | |
| download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.zip | |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index af217924a76e..ad30f074ee15 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -365,6 +365,26 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 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; } |