| From e79c556ce0654bea231f81bac611ba2ae06fa158 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Sat, 14 Oct 2017 21:17:19 +0200 |
| Subject: [PATCH 0243/1795] mmc: usdhi6rol0: 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> |
| (cherry picked from commit 2d87ddd7b63e276a2e0a11788fce9e91c4d23a86) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mmc/host/usdhi6rol0.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c |
| index 64da6a88cfb9..cdfeb15b6f05 100644 |
| --- a/drivers/mmc/host/usdhi6rol0.c |
| +++ b/drivers/mmc/host/usdhi6rol0.c |
| @@ -1757,7 +1757,7 @@ static int usdhi6_probe(struct platform_device *pdev) |
| return -ENOMEM; |
| |
| ret = mmc_regulator_get_supply(mmc); |
| - if (ret == -EPROBE_DEFER) |
| + if (ret) |
| goto e_free_mmc; |
| |
| ret = mmc_of_parse(mmc); |
| -- |
| 2.19.0 |
| |
