* [PATCH -next] net: stmmac: fix return value check in socfpga_dwmac_parse_data()
@ 2014-09-11 23:12 weiyj_lk
2014-09-13 20:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2014-09-11 23:12 UTC (permalink / raw)
To: Giuseppe Cavallaro; +Cc: Wei Yongjun, netdev
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 ++--
1 file 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 ddc6115..3aad413 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 *
}
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);
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] net: stmmac: fix return value check in socfpga_dwmac_parse_data()
2014-09-11 23:12 [PATCH -next] net: stmmac: fix return value check in socfpga_dwmac_parse_data() weiyj_lk
@ 2014-09-13 20:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-09-13 20:43 UTC (permalink / raw)
To: weiyj_lk; +Cc: peppe.cavallaro, yongjun_wei, netdev
From: weiyj_lk@163.com
Date: Fri, 12 Sep 2014 07:12:57 +0800
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-13 20:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-11 23:12 [PATCH -next] net: stmmac: fix return value check in socfpga_dwmac_parse_data() weiyj_lk
2014-09-13 20:43 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.