Message ID | 20170410135417.GD1918@mwanda (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Monday 10 April 2017 07:24 PM, Dan Carpenter wrote: > devm_pinctrl_get() returns error pointers, it never returns NULL. > > Fixes: 455e5cd6f736 ("mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> FWIW: Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com> > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index bf64cf23aa59..8c39dccacf39 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1761,8 +1761,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) > */ > if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) { > struct pinctrl *p = devm_pinctrl_get(host->dev); > - if (!p) { > - ret = -ENODEV; > + if (IS_ERR(p)) { > + ret = PTR_ERR(p); > goto err_free_irq; > } > if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) { > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10 April 2017 at 15:54, Dan Carpenter <dan.carpenter@oracle.com> wrote: > devm_pinctrl_get() returns error pointers, it never returns NULL. > > Fixes: 455e5cd6f736 ("mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks, applied for next! Kind regards Uffe > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index bf64cf23aa59..8c39dccacf39 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1761,8 +1761,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) > */ > if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) { > struct pinctrl *p = devm_pinctrl_get(host->dev); > - if (!p) { > - ret = -ENODEV; > + if (IS_ERR(p)) { > + ret = PTR_ERR(p); > goto err_free_irq; > } > if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) { -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index bf64cf23aa59..8c39dccacf39 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1761,8 +1761,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) */ if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) { struct pinctrl *p = devm_pinctrl_get(host->dev); - if (!p) { - ret = -ENODEV; + if (IS_ERR(p)) { + ret = PTR_ERR(p); goto err_free_irq; } if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) {
devm_pinctrl_get() returns error pointers, it never returns NULL. Fixes: 455e5cd6f736 ("mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html