summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2019-05-03 11:18:59 +0000
committerDavid S. Miller <davem@davemloft.net>2019-05-05 10:17:28 -0700
commitcc0d47b8eeb061cdb7715be1c4b90caf8d112142 (patch)
tree32b901139d15f148f5380125f2d2bd5978a1f570 /drivers/net/ethernet
parentca96534630e2edfd73121c487c957b17eca3b7d7 (diff)
downloadblackbird-op-linux-cc0d47b8eeb061cdb7715be1c4b90caf8d112142.tar.gz
blackbird-op-linux-cc0d47b8eeb061cdb7715be1c4b90caf8d112142.zip
drivers: net: davinci_mdio: fix return value check in davinci_mdio_probe()
In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 03f66f067560 ("net: ethernet: ti: davinci_mdio: use devm_ioremap()") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/ti/davinci_mdio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 11642721c123..38b7f6d35759 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -398,8 +398,8 @@ static int davinci_mdio_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
data->regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(data->regs))
- return PTR_ERR(data->regs);
+ if (!data->regs)
+ return -ENOMEM;
davinci_mdio_init_clk(data);
OpenPOWER on IntegriCloud