Message ID | 1282059901.26762.304.camel@black |
---|---|
State | Accepted |
Delegated to: | Leann Ogasawara |
Headers | show |
Applied to Maverick linux master but with a modified commit title and description. Please keep us posted as to when this can be dropped in favor of a real fix. Thanks, Leann On Tue, 2010-08-17 at 09:45 -0600, Mathieu Poirier wrote: > >From 479cec943c3e39c5a30b8a0302579fc3e09271fa Mon Sep 17 00:00:00 2001 > From: Mathieu J. Poirier <mathieu.poirier@canonical.com> > 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 <mathieu.poirier@canonical.com> > --- > 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); > -- > 1.7.0.4 > > > >
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);