diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-01-21 13:26:29 +0800 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-29 11:02:50 +0100 |
| commit | 4159215ac9aa020c0815141f1916b33dc226fb42 (patch) | |
| tree | 433ae5d3936a0f1a6ee4213878bfe81f3d75d96b /drivers/mmc/host/sunxi-mmc.c | |
| parent | 0314cbd438d7b9c079c4daafbdf09e788df03be8 (diff) | |
| download | op-kernel-dev-4159215ac9aa020c0815141f1916b33dc226fb42.zip op-kernel-dev-4159215ac9aa020c0815141f1916b33dc226fb42.tar.gz | |
mmc: sunxi: Return error on mmc_regulator_set_ocr() fail in .set_ios op
Let .set_ios() fail if mmc_regulator_set_ocr() fails to enable and set a
proper voltage for vmmc.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sunxi-mmc.c')
| -rw-r--r-- | drivers/mmc/host/sunxi-mmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index cce5ca5..790f016 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -711,7 +711,10 @@ static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; case MMC_POWER_UP: - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); + host->ferror = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, + ios->vdd); + if (host->ferror) + return; host->ferror = sunxi_mmc_init_host(mmc); if (host->ferror) |
