mmc_power_restore_host() calls mmc_power_up(), which
returns immediately if power is already on.
However, it still calls host->bus_ops->power_restore,
which might result in various errors if the bus_ops
doesn't handle it well (e.g. failing to run init
sequence twice)
Simply bail out in this case, without further calling
bus_ops->power_restore.
Specifically, this solves issue with wl18xx sdio card,
where the mmc core powers on the card on resume (while
MMC_PM_KEEP_POWER is not set), and the wl18xx device
driver calls mmc_power_restore_host() once more.
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
---
drivers/mmc/core/core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index c296bc0..797b574 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2604,6 +2604,11 @@ int mmc_power_restore_host(struct mmc_host *host)
return -EINVAL;
}
+ if (host->ios.power_mode == MMC_POWER_ON) {
+ mmc_bus_put(host);
+ return 0;
+ }
+
mmc_power_up(host, host->card->ocr);
ret = host->bus_ops->power_restore(host);
--
1.8.5.2.229.g4448466.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
