OMAP: mmc_twl4030 nicely disable vmmc_aux
Subsystems (3)
PATCH 1/1 OMAP: mmc_twl4030 nicely disable vmmc_aux
Quoted 1 line
From
1a3f939d95122d8e58a3750cf5bce09247357203Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
The MMC driver turns the power off before it turns it on. To avoid regulator warnings, vmmc_aux must only be disabled if it has previously been enabled.
---arch/arm/mach-omap2/mmc-twl4030.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/mmc-twl4030.c +0 -0
@@ -305,7 +305,7 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v
ret = mmc_regulator_set_ocr(c->vcc, 0);
}
} else {
- if (c->vcc_aux)
+ if (c->vcc_aux && (ret = regulator_is_enabled(c->vcc_aux)) > 0)
ret = regulator_disable(c->vcc_aux);
if (ret == 0)
ret = mmc_regulator_set_ocr(c->vcc, 0);Signature · 1 line
1.5.6.3
Quoted 8 lines · Adrian Hunter
Quoted 1 line
From
1a3f939d95122d8e58a3750cf5bce09247357203Mon Sep 17 00:00:00 2001From: Adrian Hunter <[email protected]>
The MMC driver turns the power off before it turns it on. To avoid regulator warnings,
vmmc_auxmust only be disabled if it has previously been enabled.Signed-off-by Adrian Hunter <[email protected]>
good catch.
Quoted 21 lines
--- arch/arm/mach-omap2/mmc-twl4030.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/mach-omap2/mmc-twl4030.c +1
-1@@ -305,7 +305,7 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v ret =mmc_regulator_set_ocr (c->vcc,0 ); } }else { -if (c->vcc_aux) +if (c->vcc_aux && (ret =regulator_is_enabled (c->vcc_aux)) >0 ) ret =regulator_disable (c->vcc_aux);if (ret ==0 ) ret =mmc_regulator_set_ocr (c->vcc,0 );Signature · 1 line
1.5.6.3
Tony Lindgren
maintainerPATCH 1/1 OMAP: mmc_twl4030 nicely disable vmmc_aux
In reply to Adrian HunterThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Commit: 0268abf95f935c2fe45f778b2a223685e68c7823
PatchWorks
http://patchwork.kernel.org/patch/13958/