android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm63xx_enet: fix return value check in bcm_enet_shared_probe()

Browse Source 
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 0ae99b5fede6f3a8d252d50bb4aba29544295219
(bcm63xx_enet: split DMA channel register accesses)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wei Yongjun
2013-06-19 10:32:32 +08:00
committed by David S. Miller
parent a267a6041f
commit 646093a29f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View File

@ -2862,8 +2862,8 @@ static int bcm_enet_shared_probe(struct platform_device *pdev)
for (i = 0; i < 3; i++) {
res = platform_get_resource(pdev, IORESOURCE_MEM, i);
p[i] = devm_ioremap_resource(&pdev->dev, res);
if (!p[i])
return -ENOMEM;
if (IS_ERR(p[i]))
return PTR_ERR(p[i]);
}
memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));