From 1ef9b844a1a41de4b632420d21ded9d762603ccc Mon Sep 17 00:00:00 2001 From: Philip Rakity Date: Mon, 23 Jul 2012 17:25:18 -0700 Subject: [PATCH] --- yaml --- r: 332791 b: refs/heads/master c: 77dcb3f4c344d4c9619803848f1aba4d271dac7b h: refs/heads/master i: 332789: 9b5ccc9b2fda4306a15640d648835eafe8820a76 332787: af6b3274f03135e3aedd246667ea7a8e0802d589 332783: 7a436e1b9d34aaeb4d8863a95811fa664118f02d v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac056985896b..87b139f527a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6231f3de1332b2a8a90e0c598ab6acc8f1eff7c1 +refs/heads/master: 77dcb3f4c344d4c9619803848f1aba4d271dac7b diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 828ac6c2990c..d98b1992d778 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -2908,7 +2908,8 @@ int sdhci_add_host(struct sdhci_host *host) if (IS_ERR(host->vmmc)) { pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc)); host->vmmc = NULL; - } + } else + regulator_enable(host->vmmc); #ifdef CONFIG_REGULATOR if (host->vmmc) { @@ -3165,8 +3166,10 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) tasklet_kill(&host->card_tasklet); tasklet_kill(&host->finish_tasklet); - if (host->vmmc) + if (host->vmmc) { + regulator_disable(host->vmmc); regulator_put(host->vmmc); + } if (host->vqmmc) { regulator_disable(host->vqmmc);