Commit 646093a2 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller

bcm63xx_enet: fix return value check in bcm_enet_shared_probe()

In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Introduce by commit 0ae99b5f
(bcm63xx_enet: split DMA channel register accesses)
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a267a604
...@@ -2862,8 +2862,8 @@ static int bcm_enet_shared_probe(struct platform_device *pdev) ...@@ -2862,8 +2862,8 @@ static int bcm_enet_shared_probe(struct platform_device *pdev)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
res = platform_get_resource(pdev, IORESOURCE_MEM, i); res = platform_get_resource(pdev, IORESOURCE_MEM, i);
p[i] = devm_ioremap_resource(&pdev->dev, res); p[i] = devm_ioremap_resource(&pdev->dev, res);
if (!p[i]) if (IS_ERR(p[i]))
return -ENOMEM; return PTR_ERR(p[i]);
} }
memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base)); memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment