]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mmc: sdhci-spear: Don't call clk_{un}prepare() in suspend/resume
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 8 Nov 2012 15:09:10 +0000 (20:39 +0530)
committerChris Ball <cjb@laptop.org>
Thu, 6 Dec 2012 18:55:02 +0000 (13:55 -0500)
clk_{un}prepare is mandatory for platforms using common clock
framework. Because for SPEAr we don't do anything in clk_{un}prepare()
calls, just call them once in probe/remove.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-spear.c

index fea8bf92efabcd57e2f059bc766cce97eff50b8f..87a700944b7d618968d1f5ded0967483cd03f144 100644 (file)
@@ -302,7 +302,7 @@ static int sdhci_suspend(struct device *dev)
 
        ret = sdhci_suspend_host(host);
        if (!ret)
-               clk_disable_unprepare(sdhci->clk);
+               clk_disable(sdhci->clk);
 
        return ret;
 }
@@ -313,7 +313,7 @@ static int sdhci_resume(struct device *dev)
        struct spear_sdhci *sdhci = dev_get_platdata(dev);
        int ret;
 
-       ret = clk_prepare_enable(sdhci->clk);
+       ret = clk_enable(sdhci->clk);
        if (ret) {
                dev_dbg(dev, "Resume: Error enabling clock\n");
                return ret;