mmc: sdhci-uhs2: Fix calling incorrect sdhci_set_clock() function

benchuang710 · storulf · commit 09c2b628f640 · 2025-09-12T15:00:52.000+02:00
Fix calling incorrect sdhci_set_clock() in __sdhci_uhs2_set_ios() when the vendor defines its own sdhci_set_clock(). Fixes: 10c8298 ("mmc: sdhci-uhs2: add set_ios()") Cc: stable@vger.kernel.org # v6.13+ Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
@@ -295,7 +295,7 @@ 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, ios->clock);
+	host->ops->set_clock(host, ios->clock);
 	host->clock = ios->clock;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ static void __sdhci_uhs2_set_ios(struct mmc_host mmc, struct mmc_ios ios)`
`295`	`295`	`else`
`296`	`296`	`sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);`
`297`	`297`
`298`		`- sdhci_set_clock(host, ios->clock);`
	`298`	`+ host->ops->set_clock(host, ios->clock);`
`299`	`299`	`host->clock = ios->clock;`
`300`	`300`	`}`
`301`	`301`