| Message ID | 1415104002-1580-1-git-send-email-broonie@kernel.org |
|---|---|
| State | New |
| Headers | show |
On 4 November 2014 13:26, Mark Brown <broonie@kernel.org> wrote: > From: Mark Brown <broonie@linaro.org> > > 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> Thanks! Applied for next. Kind regards Uffe > --- > drivers/mmc/host/sdhci-s3c.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index 0ce6eb17deaf..4f7a63213b33 100644 > --- 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); > -- > 2.1.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 0ce6eb17deaf..4f7a63213b33 100644 --- 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);