diff options
| author | Sundar R Iyer <sundar.iyer@stericsson.com> | 2010-03-05 12:23:59 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:44:21 -0600 |
| commit | 27627f8fc06c17bef19c1546430a9871a8f886dc (patch) | |
| tree | 6a2232dbd12493ff7e5e840f8588486e466cacb0 /drivers/mmc/host/mmc-u8500.c | |
| parent | 3cde462536ac5023d6969330063a49a3d9a39cbb (diff) | |
u8500-mmc : fix detection of onboard eMMC on HREF after power changes broke it.
Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com>
Diffstat (limited to 'drivers/mmc/host/mmc-u8500.c')
| -rw-r--r-- | drivers/mmc/host/mmc-u8500.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/host/mmc-u8500.c b/drivers/mmc/host/mmc-u8500.c index 16efb20c423..3c9c7e57d7c 100644 --- a/drivers/mmc/host/mmc-u8500.c +++ b/drivers/mmc/host/mmc-u8500.c @@ -1504,11 +1504,6 @@ static int u8500_mmci_probe(struct amba_device *dev, struct amba_id *id) host->regulator = regulator_get(&dev->dev, board->supply); if (IS_ERR(host->regulator)) { ret = PTR_ERR(host->regulator); -#if CONFIG_REGULATOR - goto put_regulator; -#else - goto unmap; -#endif } regulator_enable(host->regulator); } @@ -1516,7 +1511,11 @@ static int u8500_mmci_probe(struct amba_device *dev, struct amba_id *id) host->clk = clk_get(&dev->dev, NULL); if (IS_ERR(host->clk)) { ret = PTR_ERR(host->clk); +#if CONFIG_REGULATOR + goto put_regulator; +#else goto unmap; +#endif } clk_enable(host->clk); |