diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-09-11 19:12:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-13 16:42:47 -0400 |
| commit | f19f916d64e7a0af743bbfc7d1594db08c712f9f (patch) | |
| tree | 8cda6042a45c664d7e51e95d6cafd0ec93d18779 | |
| parent | 3ce62a84d53cd3d3cc5377bbf339e9b08ddf9c36 (diff) | |
net: stmmac: fix return value check in socfpga_dwmac_parse_data()
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>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index ddc6115720a3..3aad413e74b4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | |||
| @@ -120,9 +120,9 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device * | |||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | dwmac->splitter_base = devm_ioremap_resource(dev, &res_splitter); | 122 | dwmac->splitter_base = devm_ioremap_resource(dev, &res_splitter); |
| 123 | if (!dwmac->splitter_base) { | 123 | if (IS_ERR(dwmac->splitter_base)) { |
| 124 | dev_info(dev, "Failed to mapping emac splitter\n"); | 124 | dev_info(dev, "Failed to mapping emac splitter\n"); |
| 125 | return -EINVAL; | 125 | return PTR_ERR(dwmac->splitter_base); |
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | 128 | ||