Commit b8b2de91 authored Sep 15, 2018 by Wei Yongjun Committed by David S. Miller Sep 17, 2018

net: lantiq: Fix return value check in xrx200_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().

Fixes: fe1a5642 ("net: lantiq: Add Lantiq / Intel VRX200 Ethernet driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f592e0b9

drivers/net/ethernet/lantiq_xrx200.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -461,9 +461,9 @@ static int xrx200_probe(struct platform_device *pdev)
		}

		priv->pmac_reg = devm_ioremap_resource(dev, res);
		if (!priv->pmac_reg) {
		if (IS_ERR(priv->pmac_reg)) {
		dev_err(dev, "failed to request and remap io ranges\n");
		return -ENOMEM;
		return PTR_ERR(priv->pmac_reg);
		}

		priv->chan_rx.dma.irq = platform_get_irq_byname(pdev, "rx");