From patchwork Sun Jan 17 01:33:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 73461 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0H1YaSi022657 for ; Sun, 17 Jan 2010 01:34:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753293Ab0AQBeg (ORCPT ); Sat, 16 Jan 2010 20:34:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753300Ab0AQBef (ORCPT ); Sat, 16 Jan 2010 20:34:35 -0500 Received: from smtp.nokia.com ([192.100.122.230]:49323 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753288Ab0AQBee (ORCPT ); Sat, 16 Jan 2010 20:34:34 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0H1Xs67005246; Sun, 17 Jan 2010 03:33:54 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 17 Jan 2010 03:33:53 +0200 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Sun, 17 Jan 2010 03:33:54 +0200 Received: from ahunter-work.research.nokia.com (essapo-nirac25346.europe.nokia.com [10.162.253.46]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0H1XpgJ008470; Sun, 17 Jan 2010 03:33:51 +0200 From: Adrian Hunter To: Tony Lindgren Cc: Adrian Hunter , Madhusudhan Chikkature , Paul Walmsley , linux-omap Mailing List , linux-mmc Mailing List , Andrew Morton Date: Sun, 17 Jan 2010 03:33:51 +0200 Message-Id: <20100117013351.17308.25436.sendpatchset@ahunter-work.research.nokia.com> In-Reply-To: <20100117013250.17308.17861.sendpatchset@ahunter-work.research.nokia.com> References: <20100117013250.17308.17861.sendpatchset@ahunter-work.research.nokia.com> Subject: [PATCH V2 8/10] omap_hsmmc: Fix disable timeouts X-OriginalArrivalTime: 17 Jan 2010 01:33:54.0188 (UTC) FILETIME=[2146DCC0:01CA9715] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e15d0f4..cb94044 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1620,7 +1620,7 @@ static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host) if (host->power_mode == MMC_POWER_OFF) return 0; - return msecs_to_jiffies(OMAP_MMC_SLEEP_TIMEOUT); + return OMAP_MMC_SLEEP_TIMEOUT; } /* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */ @@ -1663,7 +1663,7 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host) mmc_slot(host).card_detect || (mmc_slot(host).get_cover_state && mmc_slot(host).get_cover_state(host->dev, host->slot_id))) - return msecs_to_jiffies(OMAP_MMC_OFF_TIMEOUT); + return OMAP_MMC_OFF_TIMEOUT; return 0; }