diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-08 10:09:10 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-12-06 13:55:02 -0500 |
commit | 06960a1b5d55d77d799050d2f62970d36d34a606 (patch) | |
tree | e763ff990deadc14c47a967213e7de1373bf5548 /drivers/mmc | |
parent | 257f9df12307cb0239196d9ec18e2af12c52435e (diff) |
mmc: sdhci-spear: Don't call clk_{un}prepare() in suspend/resume
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sdhci-spear.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index fea8bf92efab..87a700944b7d 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c | |||
@@ -302,7 +302,7 @@ static int sdhci_suspend(struct device *dev) | |||
302 | 302 | ||
303 | ret = sdhci_suspend_host(host); | 303 | ret = sdhci_suspend_host(host); |
304 | if (!ret) | 304 | if (!ret) |
305 | clk_disable_unprepare(sdhci->clk); | 305 | clk_disable(sdhci->clk); |
306 | 306 | ||
307 | return ret; | 307 | return ret; |
308 | } | 308 | } |
@@ -313,7 +313,7 @@ static int sdhci_resume(struct device *dev) | |||
313 | struct spear_sdhci *sdhci = dev_get_platdata(dev); | 313 | struct spear_sdhci *sdhci = dev_get_platdata(dev); |
314 | int ret; | 314 | int ret; |
315 | 315 | ||
316 | ret = clk_prepare_enable(sdhci->clk); | 316 | ret = clk_enable(sdhci->clk); |
317 | if (ret) { | 317 | if (ret) { |
318 | dev_dbg(dev, "Resume: Error enabling clock\n"); | 318 | dev_dbg(dev, "Resume: Error enabling clock\n"); |
319 | return ret; | 319 | return ret; |