mmc: Merge branch fixes into next

Merge the mmc fixes for v7.1-rc[n] into the next branch, to allow them to
get tested together with the mmc changes that are targeted for the next
release.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2026-05-11 17:36:21 +02:00
commit ee06a06786

View File

@ -1371,7 +1371,9 @@ static void mmc_select_driver_type(struct mmc_card *card)
card->drive_strength = drive_strength;
if (drv_type)
if (fixed_drv_type >= 0 && drive_strength)
mmc_set_driver_type(card->host, drive_strength);
else if (drv_type)
mmc_set_driver_type(card->host, drv_type);
}