Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_ad...

[pandora-kernel.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 191332b..158c0ee 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2117,14 +2117,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
        /* we start off in DISABLED state */
        host->dpm_state = DISABLED;
 
-       if (mmc_host_enable(host->mmc) != 0) {
+       if (clk_enable(host->iclk) != 0) {
                clk_put(host->iclk);
                clk_put(host->fclk);
                goto err1;
        }
 
-       if (clk_enable(host->iclk) != 0) {
-               mmc_host_disable(host->mmc);
+       if (mmc_host_enable(host->mmc) != 0) {
+               clk_disable(host->iclk);
                clk_put(host->iclk);
                clk_put(host->fclk);
                goto err1;