Commit f5de8bfe authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

net: dsa: gswip: Fix return value check in gswip_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: 14fceff4 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a3dd8c8

drivers/net/dsa/lantiq_gswip.c

+6 −6
Original line number Diff line number Diff line
@@ -1044,18 +1044,18 @@ static int gswip_probe(struct platform_device *pdev) 


	gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->gswip = devm_ioremap_resource(dev, gswip_res);

	if (!priv->gswip)

		return -ENOMEM;

	if (IS_ERR(priv->gswip))

		return PTR_ERR(priv->gswip);



	mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->mdio = devm_ioremap_resource(dev, mdio_res);

	if (!priv->mdio)

		return -ENOMEM;

	if (IS_ERR(priv->mdio))

		return PTR_ERR(priv->mdio);



	mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);

	priv->mii = devm_ioremap_resource(dev, mii_res);

	if (!priv->mii)

		return -ENOMEM;

	if (IS_ERR(priv->mii))

		return PTR_ERR(priv->mii);



	priv->hw_info = of_device_get_match_data(dev);

	if (!priv->hw_info)