Re: [PATCH] sdhci: Forward EPROBE_DEFER on vmmc and vqmmc regulators

[Ben Dooks]

On 07/04/14 13:09, Mike Looijmans wrote:
> On 04/07/2014 10:11 AM, Arnd Bergmann wrote:
> > On Monday 07 April 2014 08:38:28 Mike Looijmans wrote:
> > > index 34aef81..43b90c1 100644
> > > --- a/drivers/mmc/host/sdhci.c
> > > +++ b/drivers/mmc/host/sdhci.c
> > > @@ -2972,6 +2972,8 @@ int sdhci_add_host(struct sdhci_host *host)
> > >          host->vqmmc = regulator_get_optional(mmc_dev(mmc), "vqmmc");
> > >          if (IS_ERR_OR_NULL(host->vqmmc)) {
> > >                  if (PTR_ERR(host->vqmmc) < 0) {
> > > +                       if (PTR_ERR(host->vqmmc) == -EPROBE_DEFER)
> > > +                               return -EPROBE_DEFER;
> > >                          pr_info("%s: no vqmmc regulator found\n",
> > >                                  mmc_hostname(mmc));
> > >                          host->vqmmc = NULL;
> > > @@ -3048,8 +3050,10 @@ int sdhci_add_host(struct sdhci_host *host)
> > >          host->vmmc = regulator_get_optional(mmc_dev(mmc), "vmmc");
> > >          if (IS_ERR_OR_NULL(host->vmmc)) {
> > >                  if (PTR_ERR(host->vmmc) < 0) {
> > > -                       pr_info("%s: no vmmc regulator found\n",
> > > -                               mmc_hostname(mmc));
> > > +                       if (PTR_ERR(host->vmmc) == -EPROBE_DEFER)
> > > +                               return -EPROBE_DEFER;
> > > +                       pr_info("%s: no vmmc regulator found (%d)\n",
> > > +                               mmc_hostname(mmc), PTR_ERR(host->vmmc));
> > >                          host->vmmc = NULL;
> > >                  }
> >
> > Please change the code to not use IS_ERR_OR_NULL() instead, getting
> > a NULL return value from regulator_get_optional() should not be
> > considered a bug, while getting an error return should always
> > cause the probe function to fail.

Surely it needs to be changed to IS_ERR(), nor IS_ERR_OR_NULL()?


--
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/