diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-09-27 12:13:24 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-09-27 12:13:24 +0200 |
| commit | 3e65dba664d88ed7075ff9dc2090767fa4b3bec8 (patch) | |
| tree | 4f2574c752292fb45b6fb20cf146b5190965f49b /drivers/mmc/core/sdio.c | |
| parent | 45492b13453f9862abff6f9d7af5e8116849a9c9 (diff) | |
| parent | c7bb120c1c66672b657e95d0942c989b8275aeb3 (diff) | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.6-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.7.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index f64b9ac76a5c..5914516df2f7 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1089,8 +1089,14 @@ static int mmc_sdio_resume(struct mmc_host *host) } err = mmc_sdio_reinit_card(host); } else if (mmc_card_wake_sdio_irq(host)) { - /* We may have switched to 1-bit mode during suspend */ + /* + * We may have switched to 1-bit mode during suspend, + * need to hold retuning, because tuning only supprt + * 4-bit mode or 8 bit mode. + */ + mmc_retune_hold_now(host); err = sdio_enable_4bit_bus(host->card); + mmc_retune_release(host); } if (err) |