If we keep power for suspend on a host for dw_mmc, don't disable vmmc-supply regulator when suspending the host. Signed-off-by: Derek Basehore <dbasehore@xxxxxxxxxxxx> Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx> --- drivers/mmc/host/dw_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index ee5f167..bf82d7c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2474,7 +2474,7 @@ int dw_mci_suspend(struct dw_mci *host) } } - if (host->vmmc) + if (host->vmmc && !(host->pdata->pm_caps & MMC_PM_KEEP_POWER)) regulator_disable(host->vmmc); return 0; @@ -2485,7 +2485,7 @@ int dw_mci_resume(struct dw_mci *host) { int i, ret; - if (host->vmmc) { + if (host->vmmc && !(host->pdata->pm_caps & MMC_PM_KEEP_POWER)) { ret = regulator_enable(host->vmmc); if (ret) { dev_err(host->dev, -- 1.8.3 -- 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