GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 10:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: sh_mobile_sdhi: check return value when changing clk

Browse source 
And return the old clock rate if something went wrong.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Wolfram Sang 2016-05-02 22:25:42 +02:00 • committed by Ulf Hansson
parent 8fc0099864
commit f3f44d512c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/mmc/host/sh_mobile_sdhi.c
View file

@ -166,7 +166,7 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host,
{ {
struct sh_mobile_sdhi *priv = host_to_priv(host); struct sh_mobile_sdhi *priv = host_to_priv(host);
unsigned int freq, diff, best_freq = 0, diff_min = ~0; unsigned int freq, diff, best_freq = 0, diff_min = ~0;
int i; int i, ret;
/* tested only on RCar Gen2+ currently; may work for others */ /* tested only on RCar Gen2+ currently; may work for others */
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2)) if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
@ -195,9 +195,9 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host,
} }
} }
clk_set_rate(priv->clk, best_freq); ret = clk_set_rate(priv->clk, best_freq);
return best_freq; return ret == 0 ? best_freq : clk_get_rate(priv->clk);
} }
static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host) static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host)