diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-26 13:13:26 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-26 13:13:26 +0200 |
| commit | 0579ac48d30f8bea0c83e92fd508efc879bbe96e (patch) | |
| tree | cd8aeb997fd955efae391217477dd5913ff51530 /drivers/mmc/core/sd.c | |
| parent | 1645e815cb5c10ee7df736408d2afc9b7bcfd606 (diff) | |
| parent | 469e5e4713989fdd5e3e502b922e7be0da2464b9 (diff) | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.11-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.12.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core/sd.c')
| -rw-r--r-- | drivers/mmc/core/sd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 1c8148cdda50..ee37ad14e79e 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -26,6 +26,7 @@ #include "host.h" #include "bus.h" #include "mmc_ops.h" +#include "quirks.h" #include "sd.h" #include "sd_ops.h" @@ -1475,6 +1476,9 @@ retry: goto free_card; } + /* Apply quirks prior to card setup */ + mmc_fixup_device(card, mmc_sd_fixups); + err = mmc_sd_setup_card(host, card, oldcard != NULL); if (err) goto free_card; |