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

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
...@@ -1044,18 +1044,18 @@ static int gswip_probe(struct platform_device *pdev) ...@@ -1044,18 +1044,18 @@ static int gswip_probe(struct platform_device *pdev)
gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->gswip = devm_ioremap_resource(dev, gswip_res); priv->gswip = devm_ioremap_resource(dev, gswip_res);
if (!priv->gswip) if (IS_ERR(priv->gswip))
return -ENOMEM; return PTR_ERR(priv->gswip);
mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
priv->mdio = devm_ioremap_resource(dev, mdio_res); priv->mdio = devm_ioremap_resource(dev, mdio_res);
if (!priv->mdio) if (IS_ERR(priv->mdio))
return -ENOMEM; return PTR_ERR(priv->mdio);
mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2); mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
priv->mii = devm_ioremap_resource(dev, mii_res); priv->mii = devm_ioremap_resource(dev, mii_res);
if (!priv->mii) if (IS_ERR(priv->mii))
return -ENOMEM; return PTR_ERR(priv->mii);
priv->hw_info = of_device_get_match_data(dev); priv->hw_info = of_device_get_match_data(dev);
if (!priv->hw_info) if (!priv->hw_info)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment