mmc: sdhci-s3c: Check if clk_set_rate() succeeds

It is possible that we may fail to set the clock rate, if we do so then
log the failure and don't bother reprogramming the IP.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 0ce6eb17deaf5b6361199ed2e8583f7bd72c5b56..4f7a63213b33b524d7491b981cb7c22c4a45c532 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -300,6 +300,7 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
        struct device *dev = &ourhost->pdev->dev;
        unsigned long timeout;
        u16 clk = 0;
+       int ret;
 
        host->mmc->actual_clock = 0;
 
@@ -311,7 +312,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 
        sdhci_s3c_set_clock(host, clock);
 
-       clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
+       ret = clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
+       if (ret != 0) {
+               dev_err(dev, "%s: failed to set clock rate %uHz\n",
+                       mmc_hostname(host->mmc), clock);
+               return;
+       }
 
        clk = SDHCI_CLOCK_INT_EN;
        sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);