On 19 August 2015 at 15:41, Rabin Vincent <rabin.vincent@xxxxxxxx> wrote: > We ignore errors from mmc_regulator_get_supply() because the usage of > the regulators is optional for the driver, but we still need to check > for and handle EPROBE_DEFER, like it's done in for example dw_mmc. > Otherwise we might end up not using the specified regulators just > because of probe order. > > Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxx> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/usdhi6rol0.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c > index 54b082b..63d5d72 100644 > --- a/drivers/mmc/host/usdhi6rol0.c > +++ b/drivers/mmc/host/usdhi6rol0.c > @@ -1715,12 +1715,14 @@ static int usdhi6_probe(struct platform_device *pdev) > if (!mmc) > return -ENOMEM; > > + ret = mmc_regulator_get_supply(mmc); > + if (ret == -EPROBE_DEFER) > + goto e_free_mmc; > + > ret = mmc_of_parse(mmc); > if (ret < 0) > goto e_free_mmc; > > - mmc_regulator_get_supply(mmc); > - > host = mmc_priv(mmc); > host->mmc = mmc; > host->wait = USDHI6_WAIT_FOR_REQUEST; > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
