Am 15.02.2017 um 20:27 schrieb Kevin Hilman: > Heiner Kallweit <hkallweit1@xxxxxxxxx> writes: > >> I don't think this clk_disable_unprepare is right here. We do this >> in meson_mmc_remove what should be sufficient. > > I don't think so, because if _clk_init() fails, then _probe will fail, > and the driver's ->remove() will not be called. > In general, then the condition should be "if (ret)", not "if (!ret)". And if _clk_init() fails, then probe jumps to label free_host, where we have exactly this clk_disable_unprepare(host->cfg_div_clk) Heiner > Kevin > >> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx> >> --- >> 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 74ceda75..39904fb5 100644 >> --- a/drivers/mmc/host/meson-gx-mmc.c >> +++ b/drivers/mmc/host/meson-gx-mmc.c >> @@ -315,11 +315,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) > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
