Am 18.02.2017 um 14:57 schrieb Michał Zegan:
>
>
> W dniu 18.02.2017 o 14:19, Heiner Kallweit pisze:
>> The condition should be "if (ret)" as the disable/unprepare is
>> supposed to be executed if the previous command fails.
>> In addition adjust the error path in probe to properly deal
>> with the case that cfg_div_clk can be registered successfully
>> but enable/prepare fails.
>> In this case we shouldn't call clk_disable_unprepare.
>>
>> Reported-by: Michał Zegan <webczat_200@xxxxxxxxxxxxxx>
>> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
>> ---
>> v2:
>> - extended commit message
>> v3:
>> - adjust error path in probe
>> ---
>> drivers/mmc/host/meson-gx-mmc.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
>> index 68e76fa8..002e4aac 100644
>> --- a/drivers/mmc/host/meson-gx-mmc.c
>> +++ b/drivers/mmc/host/meson-gx-mmc.c
>> @@ -321,7 +321,7 @@ static int meson_mmc_clk_init(struct meson_host *host)
>> host->mmc->f_min = clk_round_rate(host->cfg_div_clk, 400000);
>>
>> ret = meson_mmc_clk_set(host, host->mmc->f_min);
>> - if (!ret)
>> + if (ret)
>> clk_disable_unprepare(host->cfg_div_clk);
>>
>> return ret;
>> @@ -771,7 +771,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
>> meson_mmc_irq_thread, IRQF_SHARED,
>> DRIVER_NAME, host);
>> if (ret)
>> - goto free_host;
>> + goto err_div_clk;
>>
>> mmc->max_blk_count = CMD_CFG_LENGTH_MASK;
>> mmc->max_req_size = mmc->max_blk_count * mmc->max_blk_size;
>> @@ -784,7 +784,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
>> if (host->bounce_buf == NULL) {
>> dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n");
>> ret = -ENOMEM;
>> - goto free_host;
>> + goto err_div_clk;
>> }
>>
>> mmc->ops = &meson_mmc_ops;
>> @@ -792,8 +792,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
>>
>> return 0;
>>
>> -free_host:
>> +err_div_clk:
>> clk_disable_unprepare(host->cfg_div_clk);
>> +free_host:
>> clk_disable_unprepare(host->core_clk);
>> mmc_free_host(mmc);
>> return ret;
>>
> Doesn't the same problem exist with a core clock? It also could error
> when being enabled, and it will be disabled even if not enabled before...
>
Yes, there it's basically the same issue. Feel free to submit a patch.
--
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
