lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.35-rc6' into devicetree/next

Browse Source 
Conflicts:
	arch/sparc/kernel/prom_64.c
This commit is contained in:
Grant Likely
2010-07-24 09:49:13 -06:00
parent 9e3288dc9a b37fa16e78
commit 4e4f62bf73
994 changed files with 10066 additions and 201378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mmc/host/sdhci-s3c.c
View File

@@ -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;
}