---

yaml --- r: 332791 b: refs/heads/master c: 77dcb3f h: refs/heads/master i: 332789: 9b5ccc9 332787: af6b327 332783: 7a436e1 v: v3
git-mirror · Sep 4, 2012 · 1ef9b84 · 1ef9b84
1 parent 79fe7c5
commit 1ef9b84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);