From: Shawn Lin Date: Fri, 22 Nov 2024 09:37:22 +0000 (+0800) Subject: mmc: core: Respect quirk_max_rate for non-UHS SDIO card X-Git-Tag: v6.14-rc1~153^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2a44f8da29352f76c99c6904ee652911b8dc7dd;p=thirdparty%2Fkernel%2Flinux.git mmc: core: Respect quirk_max_rate for non-UHS SDIO card The card-quirk was added to limit the clock-rate for a card with UHS-mode support, although let's respect the quirk for non-UHS mode too, to make the behaviour consistent. Signed-off-by: Shawn Lin Message-ID: <1732268242-72799-1-git-send-email-shawn.lin@rock-chips.com> Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 9566837c9848e..4b19b8a16b096 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -458,6 +458,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card) if (mmc_card_sd_combo(card)) max_dtr = min(max_dtr, mmc_sd_get_max_clock(card)); + max_dtr = min_not_zero(max_dtr, card->quirk_max_rate); + return max_dtr; }