Skip to content

Commit

Permalink
mmc: mmci: catch all errors when getting regulators
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wolfram Sang authored and Ulf Hansson committed Oct 30, 2017
1 parent aa5754c commit 5100695
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,7 @@ static int mmci_probe(struct amba_device *dev,

/* Get regulators and the supported OCR mask */
ret = mmc_regulator_get_supply(mmc);
if (ret == -EPROBE_DEFER)
if (ret)
goto clk_disable;

if (!mmc->ocr_avail)
Expand Down

0 comments on commit 5100695

Please sign in to comment.