diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2019-06-18 14:54:10 +0300 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2019-06-18 06:47:59 -0700 |
| commit | cd3967bee004bcbd142403698d658166fa618c9e (patch) | |
| tree | 9626bcbde0016f7707b34adfbd9904eea8d39f06 /drivers/soc | |
| parent | ARM: ixp4xx: include irqs.h where needed (diff) | |
| download | linux-dev-cd3967bee004bcbd142403698d658166fa618c9e.tar.xz linux-dev-cd3967bee004bcbd142403698d658166fa618c9e.zip | |
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: 0b458d7b10f8 ("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>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ixp4xx/ixp4xx-npe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/ixp4xx/ixp4xx-npe.c b/drivers/soc/ixp4xx/ixp4xx-npe.c index bc10e3194809..ec90b44fa0cd 100644 --- a/drivers/soc/ixp4xx/ixp4xx-npe.c +++ b/drivers/soc/ixp4xx/ixp4xx-npe.c @@ -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", |