summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2017-10-14 21:17:12 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2017-10-30 11:50:34 +0100
commitfa54f3e359d6d007f6c3f0f990c35d10a46b9919 (patch)
treec059dd435b67281b808ffc7e4fb0e7bf51d929dc /drivers/mmc
parent0f3a47b80090cc4843f3ea6dea5c02b4f559698f (diff)
downloadlinux-fa54f3e359d6d007f6c3f0f990c35d10a46b9919.tar.gz
linux-fa54f3e359d6d007f6c3f0f990c35d10a46b9919.tar.bz2
linux-fa54f3e359d6d007f6c3f0f990c35d10a46b9919.zip
mmc: meson-gx-mmc: catch all errors when getting regulators
Bail out everytime when mmc_regulator_get_supply() returns an errno, not only when probing gets deferred. This is currently a no-op, because this function only returns -EPROBE_DEFER or 0 right now. But if it will throw another error somewhen, it will be for a reason. (This still doesn't change that getting regulators is optional, so 0 can still mean no regulators found). So, let us a) be future proof and b) have driver code which is easier to understand. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/meson-gx-mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 85745ef179e2..e0862d3f65b3 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1190,7 +1190,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
/* Get regulators and the supported OCR mask */
host->vqmmc_enabled = false;
ret = mmc_regulator_get_supply(mmc);
- if (ret == -EPROBE_DEFER)
+ if (ret)
goto free_host;
ret = mmc_of_parse(mmc);