diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-03-12 12:21:57 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-03-12 12:21:57 +0100 |
| commit | 4139badab0d8fc83d3c1c0993eb6bdea7bab9745 (patch) | |
| tree | 7cd4f228909b347bb2fb185996ed8bc4099246ee | |
| parent | dt-bindings: mmc: sunxi: add compatible strings for Allwinner A523 (diff) | |
| parent | mmc: atmel-mci: Add missing clk_disable_unprepare() (diff) | |
| download | linux-4139badab0d8fc83d3c1c0993eb6bdea7bab9745.tar.gz linux-4139badab0d8fc83d3c1c0993eb6bdea7bab9745.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.14-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.15.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index fc360902729d..24fffc702a94 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2499,8 +2499,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; |