[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAPDyKFoZ1ztGJ5TTJkDBSipm1Xru8=voXo7_CO_p9mB1XZCnbA@mail.gmail.com>
Date: Wed, 25 Mar 2015 09:51:55 +0100
From: Ulf Hansson <ulf.hansson@...aro.org>
To: Bjorn Andersson <bjorn.andersson@...ymobile.com>
Cc: Russell King <linux@....linux.org.uk>,
Chris Ball <chris@...ntf.net>,
linux-mmc <linux-mmc@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] mmc: mmci: Cascade EPROBE_DEFER from regulators.
On 25 March 2015 at 02:39, Bjorn Andersson
<bjorn.andersson@...ymobile.com> wrote:
> Signed-off-by: Bjorn Andersson <bjorn.andersson@...ymobile.com>
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists