]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: atmel-mci: Add missing clk_disable_unprepare()
authorGu Bowen <gubowen5@huawei.com>
Tue, 25 Feb 2025 02:28:56 +0000 (10:28 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Mar 2025 20:59:54 +0000 (21:59 +0100)
commit e51a349d2dcf1df8422dabb90b2f691dc7df6f92 upstream.

The error path when atmci_configure_dma() set dma fails in atmci driver
does not correctly disable the clock.
Add the missing clk_disable_unprepare() to the error path for pair with
clk_prepare_enable().

Fixes: 467e081d23e6 ("mmc: atmel-mci: use probe deferring if dma controller is not ready yet")
Signed-off-by: Gu Bowen <gubowen5@huawei.com>
Acked-by: Aubin Constans <aubin.constans@microchip.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250225022856.3452240-1-gubowen5@huawei.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/atmel-mci.c

index 535783c43105679c23331eaa779b4ed7314cf67a..45cda1248816c8899f78f5132d18e5a1ae92dec9 100644 (file)
@@ -2536,8 +2536,10 @@ static int atmci_probe(struct platform_device *pdev)
        /* Get MCI capabilities and set operations according to it */
        atmci_get_cap(host);
        ret = atmci_configure_dma(host);
-       if (ret == -EPROBE_DEFER)
+       if (ret == -EPROBE_DEFER) {
+               clk_disable_unprepare(host->mck);
                goto err_dma_probe_defer;
+       }
        if (ret == 0) {
                host->prepare_data = &atmci_prepare_data_dma;
                host->submit_data = &atmci_submit_data_dma;