net: dsa: gswip: Fix return value check in gswip_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Sat, 15 Sep 2018 01:33:21 +0000 (01:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2018 15:05:58 +0000 (08:05 -0700)
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: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
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>
drivers/net/dsa/lantiq_gswip.c

index 9c28d0b2fcdbe8ed13ee6f77eb9faff6f0d90da9..faac359097432a25c55905733fce88f3190c8d99 100644 (file)
@@ -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)