From patchwork Wed May 5 10:31:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 97024 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45AWY3P017984 for ; Wed, 5 May 2010 10:32:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934428Ab0EEKcc (ORCPT ); Wed, 5 May 2010 06:32:32 -0400 Received: from smtp.nokia.com ([192.100.105.134]:60936 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934369Ab0EEKca (ORCPT ); Wed, 5 May 2010 06:32:30 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o45AWHlW028317; Wed, 5 May 2010 05:32:18 -0500 Received: from vaepf101.NOE.Nokia.com ([10.160.244.86]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 13:31:56 +0300 Received: from [172.21.41.139] ([172.21.41.139]) by vaepf101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 13:31:56 +0300 Message-ID: <4BE1491C.20005@nokia.com> Date: Wed, 05 May 2010 13:31:56 +0300 From: Adrian Hunter User-Agent: Thunderbird 2.0.0.24 (X11/20100411) MIME-Version: 1.0 To: kishore kadiyala CC: "linux-mmc@vger.kernel.org" , "linux-omap@vger.kernel.org" , "tony@atomide.com" , "madhu.cr@ti.com" , "Lavinen Jarkko (Nokia-D/Helsinki)" , "rmk@arm.linux.org.uk" , "paul@pwsan.com" Subject: Re: [PATCH v2 3/5] OMAP4-HSMMC: Adding MMC-TWL regulator changes References: <35156.10.24.255.17.1272988897.squirrel@dbdmail.itg.ti.com> In-Reply-To: <35156.10.24.255.17.1272988897.squirrel@dbdmail.itg.ti.com> X-OriginalArrivalTime: 05 May 2010 10:31:56.0729 (UTC) FILETIME=[2FC8B290:01CAEC3E] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 10:32:34 +0000 (UTC) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e9caf69..f792cff 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -465,8 +465,6 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) int ret; if (gpio_is_valid(pdata->slots[0].switch_pin)) { - pdata->suspend = omap_hsmmc_suspend_cdirq; - pdata->resume = omap_hsmmc_resume_cdirq; if (pdata->slots[0].cover) pdata->slots[0].get_cover_state = omap_hsmmc_get_cover_state; @@ -2160,6 +2158,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) "Unable to grab MMC CD IRQ\n"); goto err_irq_cd; } + pdata->suspend = omap_hsmmc_suspend_cdirq; + pdata->resume = omap_hsmmc_resume_cdirq; } OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK);