From patchwork Tue Aug 17 15:45:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 61923 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 78F6FB710B for ; Wed, 18 Aug 2010 01:45:17 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OlOLa-0007Kb-Ue; Tue, 17 Aug 2010 16:45:06 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OlOLZ-0007KI-40 for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2010 16:45:05 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OlOLZ-00054Z-2G for ; Tue, 17 Aug 2010 16:45:05 +0100 Received: from s0106002369de4dac.cg.shawcable.net ([70.73.24.112] helo=[192.168.1.100]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OlOLY-00029L-MZ for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2010 16:45:05 +0100 Subject: [PATCH] UBUNTU : SAUCE (no-up) - ARM: Resetting power_mode to its original value. From: Mathieu Poirier To: kernel-team@lists.ubuntu.com Date: Tue, 17 Aug 2010 09:45:01 -0600 Message-ID: <1282059901.26762.304.camel@black> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 479cec943c3e39c5a30b8a0302579fc3e09271fa Mon Sep 17 00:00:00 2001 From: Mathieu J. Poirier Date: Tue, 17 Aug 2010 11:16:41 -0400 Subject: [PATCH] UBUNTU - ARM: Resetting power_mode to its original value. Reverting the second part of patch: 6da20c89af64b75302399369a90b9d50c1a87665 Work is currently underway with the community to find a real solution to the problem. This a temporary measure to unblock developers and will have to be reverted when the real fix gets submitted. BugLink: https://bugs.launchpad.net/bugs/591941 Signed-off-by: Mathieu Poirier --- drivers/mmc/host/omap_hsmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index b032828..a77c394 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2010,7 +2010,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) host->slot_id = 0; host->mapbase = res->start; host->base = ioremap(host->mapbase, SZ_4K); - host->power_mode = MMC_POWER_OFF; + host->power_mode = -1; platform_set_drvdata(pdev, host); INIT_WORK(&host->mmc_carddetect_work, omap_hsmmc_detect);