hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: atmel-mci: Add missing clk_disable_unprepare()

Browse Source 
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>
This commit is contained in:
Gu Bowen 2025-02-25 10:28:56 +08:00 committed by Greg Kroah-Hartman
parent be320c2666
commit b9a1c6e888
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/atmel-mci.c
View File

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