diff options
| author | vjagadish <vjagadish@nvidia.com> | 2012-02-01 18:35:22 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-13 06:39:24 -0800 |
| commit | cd01979348c680bcec4821e4f5a78d0e51080e10 (patch) | |
| tree | 8c5cb0f6794320f17683fa0c39f80ff16ab3f6f1 /drivers/mmc/host/sdhci-tegra.c | |
| parent | a07c190b888b947ed848e158d95dab1ddf6bd575 (diff) | |
sdhci: tegra: Enabling regulator when card is present
Enable the regulator with out any dependency on slot
regulator
Bug 932739
Signed-off-by: vjagadish <vjagadish@nvidia.com>
Reviewed-on: http://git-master/r/78745
(cherry picked from commit 83d256fe3c269f59436a7cc08e46235ab5c067c8)
Change-Id: I80fbaef6b76fd4bb7990c29499a62abfe46e5150
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/82711
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/mmc/host/sdhci-tegra.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 344f9afc6764..95c8cad1dda8 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -775,14 +775,14 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) dev_err(mmc_dev(host->mmc), "%s regulator not found: %ld\n", "vddio_sd_slot", PTR_ERR(tegra_host->vdd_slot_reg)); tegra_host->vdd_slot_reg = NULL; - } else { - if (tegra_host->card_present) { - if (tegra_host->vdd_slot_reg) - regulator_enable(tegra_host->vdd_slot_reg); - if (tegra_host->vdd_io_reg) - regulator_enable(tegra_host->vdd_io_reg); - tegra_host->is_rail_enabled = 1; - } + } + + if (tegra_host->card_present) { + if (tegra_host->vdd_slot_reg) + regulator_enable(tegra_host->vdd_slot_reg); + if (tegra_host->vdd_io_reg) + regulator_enable(tegra_host->vdd_io_reg); + tegra_host->is_rail_enabled = 1; } } |