[PATCH v5 7/8] mmc: sdhci-esdhc-imx: make non-fatal errors non-blocking in suspend
From: <hidden>
Date: 2026-07-07 11:00:59
Also in:
imx, linux-mmc, lkml
Subsystem:
multimedia card (mmc), secure digital (sd) and sdio subsystem, secure digital host controller interface (sdhci) driver, secure digital host controller interface (sdhci) nxp i.mx driver, the rest · Maintainers:
Ulf Hansson, Adrian Hunter, Haibo Chen, Linus Torvalds
From: Luke Wang <redacted> Make pinctrl_pm_select_sleep_state() and mmc_gpio_set_cd_wake() failures non-fatal in the suspend path. These failures only mean slightly higher power consumption or missing CD wakeup capability, but should not block system suspend. Also change the function to always return 0 on the success path instead of propagating non-fatal warning return values. Signed-off-by: Luke Wang <redacted> --- drivers/mmc/host/sdhci-esdhc-imx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 7818f351a58a..6cb84690fde4 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c@@ -2097,10 +2097,12 @@ static int sdhci_esdhc_suspend(struct device *dev) */ ret = pinctrl_pm_select_sleep_state(dev); if (ret) - return ret; + dev_warn(dev, "Failed to select sleep pinctrl state\n"); } ret = mmc_gpio_set_cd_wake(host->mmc, true); + if (ret) + dev_warn(dev, "Failed to enable cd wake\n"); /* * Make sure invoke runtime_suspend to gate off clock.
@@ -2108,7 +2110,7 @@ static int sdhci_esdhc_suspend(struct device *dev) */ pm_runtime_force_suspend(dev); - return ret; + return 0; } static int sdhci_esdhc_resume(struct device *dev)
--
2.34.1