* [PATCH] netdev: octeon: fix return value check in octeon_mgmt_init_phy()
@ 2012-09-28 5:04 Wei Yongjun
2012-09-28 5:18 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2012-09-28 5:04 UTC (permalink / raw)
To: grant.likely, rob.herring; +Cc: yongjun_wei, netdev, devicetree-discuss
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
In case of error, the function of_phy_connect() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index c42bbb1..a688a2d 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -722,10 +722,8 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
octeon_mgmt_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
- if (IS_ERR(p->phydev)) {
- p->phydev = NULL;
+ if (!p->phydev)
return -1;
- }
phy_start_aneg(p->phydev);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netdev: octeon: fix return value check in octeon_mgmt_init_phy()
2012-09-28 5:04 [PATCH] netdev: octeon: fix return value check in octeon_mgmt_init_phy() Wei Yongjun
@ 2012-09-28 5:18 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-09-28 5:18 UTC (permalink / raw)
To: weiyj.lk; +Cc: grant.likely, rob.herring, yongjun_wei, netdev,
devicetree-discuss
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Fri, 28 Sep 2012 13:04:21 +0800
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function of_phy_connect() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value
> check should be replaced with NULL test.
>
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-28 5:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-28 5:04 [PATCH] netdev: octeon: fix return value check in octeon_mgmt_init_phy() Wei Yongjun
2012-09-28 5:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).