mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 23:23:03 +00:00
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: 0b458d7b10
("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>
This commit is contained in:
parent
140d90098f
commit
cd3967bee0
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user