From f738128a55a4ce0216902041be7f053598536132 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 22 Sep 2011 11:36:41 +0100 Subject: [PATCH] --- yaml --- r: 269438 b: refs/heads/master c: 52ca0f3ab568497adeac217e4167b51d9b4d4884 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mmci.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 062961e685e1..4fa0ed71ef62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b4851c65d926f46e208e4731409022d986a1355 +refs/heads/master: 52ca0f3ab568497adeac217e4167b51d9b4d4884 diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c index 5e142b7f5ecf..7be8db0f9f7d 100644 --- a/trunk/drivers/mmc/host/mmci.c +++ b/trunk/drivers/mmc/host/mmci.c @@ -1160,10 +1160,14 @@ static int __devinit mmci_probe(struct amba_device *dev, goto host_free; } - ret = clk_enable(host->clk); + ret = clk_prepare(host->clk); if (ret) goto clk_free; + ret = clk_enable(host->clk); + if (ret) + goto clk_unprep; + host->plat = plat; host->variant = variant; host->mclk = clk_get_rate(host->clk); @@ -1351,6 +1355,8 @@ static int __devinit mmci_probe(struct amba_device *dev, iounmap(host->base); clk_disable: clk_disable(host->clk); + clk_unprep: + clk_unprepare(host->clk); clk_free: clk_put(host->clk); host_free: @@ -1398,6 +1404,7 @@ static int __devexit mmci_remove(struct amba_device *dev) iounmap(host->base); clk_disable(host->clk); + clk_unprepare(host->clk); clk_put(host->clk); if (host->vcc)