On 25 March 2015 at 02:39, Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx> wrote: > Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx> Thanks! Applied. Kind regards Uffe > --- > drivers/mmc/host/mmci.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 7fe1619..fb26674 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -1613,7 +1613,10 @@ static int mmci_probe(struct amba_device *dev, > dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); > > /* Get regulators and the supported OCR mask */ > - mmc_regulator_get_supply(mmc); > + ret = mmc_regulator_get_supply(mmc); > + if (ret == -EPROBE_DEFER) > + goto clk_disable; > + > if (!mmc->ocr_avail) > mmc->ocr_avail = plat->ocr_mask; > else if (plat->ocr_mask) > -- > 1.8.2.2 > -- 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
