On Wed, Sep 10, 2025 at 2:55 PM Adrian Hunter adrian.hunter@intel.com wrote:
On 05/09/2025 11:00, Ben Chuang wrote:
From: Ben Chuang ben.chuang@genesyslogic.com.tw
Fix calling incorrect sdhci_set_clock() in __sdhci_uhs2_set_ios() when the vendor defines its own sdhci_set_clock().
Fixes: 10c8298a052b ("mmc: sdhci-uhs2: add set_ios()") Cc: stable@vger.kernel.org # v6.13+ Signed-off-by: Ben Chuang ben.chuang@genesyslogic.com.tw
v2:
- remove the "if (host->ops->set_clock)" statement
- add "host->clock = ios->clock;"
v1:
drivers/mmc/host/sdhci-uhs2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c index 0efeb9d0c376..c459a08d01da 100644 --- a/drivers/mmc/host/sdhci-uhs2.c +++ b/drivers/mmc/host/sdhci-uhs2.c @@ -295,7 +295,8 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) else sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);
sdhci_set_clock(host, host->clock);
host->ops->set_clock(host, ios->clock);host->clock = ios->clock;The change that host->clock has not yet been set to ios->clock needs to be part of patch 1. i.e. put the following in patch 1
sdhci_set_clock(host, host->clock);
sdhci_set_clock(host, ios->clock);host->clock = ios->clock;
I will update it in the next series. Thanks.