Commit df555b66 authored Sep 27, 2012 by Wei Yongjun Committed by David S. Miller Sep 28, 2012

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>

parent bc9259a8

drivers/net/ethernet/octeon/octeon_mgmt.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -722,10 +722,8 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
	octeon_mgmt_adjust_link, 0,		octeon_mgmt_adjust_link, 0,
	PHY_INTERFACE_MODE_MII);		PHY_INTERFACE_MODE_MII);

	if (IS_ERR(p->phydev)) {		if (!p->phydev)
	p->phydev = NULL;
	return -1;		return -1;
	}

	phy_start_aneg(p->phydev);		phy_start_aneg(p->phydev);