Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756974Ab3HGD3G (ORCPT ); Tue, 6 Aug 2013 23:29:06 -0400 Received: from mail-ye0-f201.google.com ([209.85.213.201]:40662 "EHLO mail-ye0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756916Ab3HGD3E (ORCPT ); Tue, 6 Aug 2013 23:29:04 -0400 From: Derek Basehore To: Seungwon Jeon Cc: Chris Ball , Grant Likely , Rob Herring , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Derek Basehore Subject: [PATCH] mmc: dw_mmc: Don't disable vmmc if keeping power in suspend Date: Tue, 6 Aug 2013 20:28:58 -0700 Message-Id: <1375846138-15839-1-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 1.8.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1174 Lines: 39 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 Reviewed-by: Doug Anderson --- 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/