diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-19 10:32:32 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-19 00:48:58 -0700 |
| commit | 646093a29f85630d8efe2aa38fa585d2c3ea2e46 (patch) | |
| tree | 1961c2a83d9bd491f2ce6d236c258fd9cf292661 /drivers/net/ethernet/broadcom/bcm63xx_enet.c | |
| parent | staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb) (diff) | |
| download | linux-dev-646093a29f85630d8efe2aa38fa585d2c3ea2e46.tar.xz linux-dev-646093a29f85630d8efe2aa38fa585d2c3ea2e46.zip | |
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)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 8f1ac023bb03..b1bcd4ba4744 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -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)); |