Commit cd3967be authored Jun 18, 2019 by Dan Carpenter Committed by Olof Johansson Jun 18, 2019

soc: ixp4xx: npe: Fix an IS_ERR() vs NULL check in probe



The devm_ioremap_resource() function doesn't return NULL, it returns
error pointers.

Fixes: 0b458d7b ("soc: ixp4xx: npe: Pass addresses as resources")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 140d9009

drivers/soc/ixp4xx/ixp4xx-npe.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -695,8 +695,8 @@ static int ixp4xx_npe_probe(struct platform_device *pdev)
		continue; /* NPE already disabled or not present */
		}
		npe->regs = devm_ioremap_resource(dev, res);
		if (!npe->regs)
		return -ENOMEM;
		if (IS_ERR(npe->regs))
		return PTR_ERR(npe->regs);

		if (npe_reset(npe)) {
		dev_info(dev, "NPE%d at 0x%08x-0x%08x does not reset\n",

Admin message