net: stmmac: fix return value check in socfpga_dwmac_parse_data()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 11 Sep 2014 23:12:57 +0000 (07:12 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Sep 2014 20:42:47 +0000 (16:42 -0400)
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().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

index ddc6115720a332794a6488f41a86ff4ae6b6fa32..3aad413e74b4a4ba9dd19012cf85460870840015 100644 (file)
@@ -120,9 +120,9 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
                }
 
                dwmac->splitter_base = devm_ioremap_resource(dev, &res_splitter);
-               if (!dwmac->splitter_base) {
+               if (IS_ERR(dwmac->splitter_base)) {
                        dev_info(dev, "Failed to mapping emac splitter\n");
-                       return -EINVAL;
+                       return PTR_ERR(dwmac->splitter_base);
                }
        }