From patchwork Wed May 11 06:52:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 777382 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4BH2tkx022851 for ; Wed, 11 May 2011 17:02:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757607Ab1EKRCz (ORCPT ); Wed, 11 May 2011 13:02:55 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:49070 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754477Ab1EKRCy (ORCPT ); Wed, 11 May 2011 13:02:54 -0400 Received: from epcpsbgm1.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LL0003LQR3JFZ90@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Wed, 11 May 2011 15:52:32 +0900 (KST) X-AuditID: cbfee61a-b7c84ae000006ee6-aa-4dca32302512 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id FA.A6.28390.0323ACD4; Wed, 11 May 2011 15:52:32 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LL000I0OR3K5L@mmp2.samsung.com> for linux-mmc@vger.kernel.org; Wed, 11 May 2011 15:52:32 +0900 (KST) Received: from [165.213.219.108] ([165.213.219.108]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 11 May 2011 15:52:31 +0900 Date: Wed, 11 May 2011 15:52:39 +0900 From: Jaehoon Chung Subject: [PATCH] dw_mmc: fixed wrong regulator_enable in suspend/resume To: "linux-mmc@vger.kernel.org" Cc: Chris Ball , will.newton@imgtec.com, Kyungmin Park Message-id: <4DCA3237.3080609@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7BIT User-Agent: Thunderbird 2.0.0.24 (X11/20100623) X-OriginalArrivalTime: 11 May 2011 06:52:31.0919 (UTC) FILETIME=[00335BF0:01CC0FA8] X-Brightmail-Tracker: AAAAAA== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 11 May 2011 17:02:55 +0000 (UTC) In suspend function, regulator_enable() need not. regulator_enable() should be locate in resume function. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Will Newton --- drivers/mmc/host/dw_mmc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 87e1f57..66dcddb 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1769,9 +1769,6 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg) int i, ret; struct dw_mci *host = platform_get_drvdata(pdev); - if (host->vmmc) - regulator_enable(host->vmmc); - for (i = 0; i < host->num_slots; i++) { struct dw_mci_slot *slot = host->slot[i]; if (!slot) @@ -1798,6 +1795,9 @@ static int dw_mci_resume(struct platform_device *pdev) int i, ret; struct dw_mci *host = platform_get_drvdata(pdev); + if (host->vmmc) + regulator_enable(host->vmmc); + if (host->dma_ops->init) host->dma_ops->init(host);