OSDN Git Service

mmc: host: omap_hsmmc: checking for NULL instead of IS_ERR()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 10 Apr 2017 13:54:17 +0000 (16:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Mar 2018 09:58:43 +0000 (10:58 +0100)
[ Upstream commit ec5ab8933772c87f24ad62a4a602fe8949f423c2 ]

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>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/omap_hsmmc.c

index 7fb0753..6b814d7 100644 (file)
@@ -1776,8 +1776,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))) {