diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-27 19:04:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-28 01:18:32 -0400 |
| commit | df555b665367f9de6c04826acc482096f17c243d (patch) | |
| tree | a7ddfe21f30e9b0f99da71425e9e6aeef430aa33 /drivers/net | |
| parent | bc9259a8bae9e814fc1f775a1b3effa13e6ad330 (diff) | |
| download | linux-3.10-df555b665367f9de6c04826acc482096f17c243d.tar.gz linux-3.10-df555b665367f9de6c04826acc482096f17c243d.tar.bz2 linux-3.10-df555b665367f9de6c04826acc482096f17c243d.zip | |
netdev: octeon: fix return value check in octeon_mgmt_init_phy()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index c42bbb16cda..a688a2ddcfd 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); |