OSDN Git Service

netdev: octeon: fix return value check in octeon_mgmt_init_phy()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 27 Sep 2012 19:04:21 +0000 (19:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2012 05:18:32 +0000 (01:18 -0400)
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>
drivers/net/ethernet/octeon/octeon_mgmt.c

index c42bbb1..a688a2d 100644 (file)
@@ -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);