summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBitan Biswas <bbiswas@nvidia.com>2011-06-08 11:19:58 +0530
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-14 16:09:59 -0700
commited055bf002bc1964e51397b61575c818a705b440 (patch)
treeb677a1cff0d0e4d54f90526ace281a178799a87e /drivers
parentab134d7b0f71b179f5f4af091f9734d9bb02632a (diff)
sdhci: tegra: vddio rail error path initialization
If set voltage vddio rail fails, vddio pointer remains as non-null. This causes error for vddio rail regulator_disable call during suspend. In error path vddio rail is reset to NULL to prevent above problem. Bug 836172 Change-Id: I48b3cb3b9792f54f2661b13b95299d8caac4e144 Reviewed-on: http://git-master/r/35621 Reviewed-by: Bitan Biswas <bbiswas@nvidia.com> Tested-by: Bitan Biswas <bbiswas@nvidia.com> Reviewed-by: Ramachandrudu Kandhala <rkandhala@nvidia.com> Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-tegra.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index e5a2e5a21f51..bf1f3fae9456 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -337,8 +337,10 @@ static int __devinit tegra_sdhci_probe(struct platform_device *pdev)
"voltage() for rail %s "
"failed:i %d\n",
plat->vdd_rail_name, rc);
- } else
+ host->reg_vddio = NULL;
+ } else {
regulator_enable(host->reg_vddio);
+ }
}
}