History

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

Wei Yongjun committed 13 years ago

Commit 646093a1 parent a267a601 file · +2 −2Browse files

Unified · Split

drivers/net/ethernet/broadcom/bcm63xx_enet.c+2−2
@@ -2862,8 +2862,8 @@ static int bcm_enet_shared_probe(struct platform_device *pdev) · 2861 unmodified lines
2862 for (i = 0; i < 3; i++) {2862 for (i = 0; i < 3; i++) {
2863 res = platform_get_resource(pdev, IORESOURCE_MEM, i);2863 res = platform_get_resource(pdev, IORESOURCE_MEM, i);
2864 p[i] = devm_ioremap_resource(&pdev->dev, res);2864 p[i] = devm_ioremap_resource(&pdev->dev, res);
2865 if (!p[i])2865 if (IS_ERR(p[i]))
2866 return -ENOMEM;2866 return PTR_ERR(p[i]);
2867 }2867 }
2868 2868
2869 memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));2869 memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t