[PATCH v2 6/9] mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init

Heiner Kallweit
2017-02-16T19:43:10Z

This clk_disable_unprepare isn't right here. At first the condition
should be "if (ret)" as the disable/unprepare is supposed to be
executed if the previous command fails.
And if the previous command fails and meson_mmc_clk_init returns
an error, then probe jumps to label free_host where we have this
disable/unprepare already.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- extended commit message
---
drivers/mmc/host/meson-gx-mmc.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 68e76fa8..850b0152 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)
/* Get the nearest minimum clock to 400KHz */
host->mmc->f_min = clk_round_rate(host->cfg_div_clk, 400000);

- ret = meson_mmc_clk_set(host, host->mmc->f_min);
- if (!ret)
- clk_disable_unprepare(host->cfg_div_clk);
-
- return ret;
+ return meson_mmc_clk_set(host, host->mmc->f_min);
}

static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
--
2.11.1