From 289189bfb2a84c4351906c7080941a1e366e9be4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Mon, 6 May 2019 08:31:08 +0200 Subject: [PATCH] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe The devm_ioremap_resource() function doesn't retunr NULL, it returns error pointers. Fixes: cf8545d89dfd ("soc: ixp4xx: qmgr: Pass resources") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net> --- drivers/soc/ixp4xx/ixp4xx-qmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c index 13a8a13c9b01d..bb90670ec1609 100644 --- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c +++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c @@ -385,8 +385,8 @@ static int ixp4xx_qmgr_probe(struct platform_device *pdev) if (!res) return -ENODEV; qmgr_regs = devm_ioremap_resource(dev, res); - if (!qmgr_regs) - return -ENOMEM; + if (IS_ERR(qmgr_regs)) + return PTR_ERR(qmgr_regs); irq1 = platform_get_irq(pdev, 0); if (irq1 <= 0) -- 2.39.5