Commit beb5ac20 authored Sep 26, 2012 by Wei Yongjun Committed by David S. Miller Sep 27, 2012

netdev: pasemi: fix return value check in pasemi_mac_phy_init()

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 a326e6dd

drivers/net/ethernet/pasemi/pasemi_mac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1101,9 +1101,9 @@ static int pasemi_mac_phy_init(struct net_device *dev)
		phydev = of_phy_connect(dev, phy_dn, &pasemi_adjust_link, 0,
		PHY_INTERFACE_MODE_SGMII);

		if (IS_ERR(phydev)) {
		if (!phydev) {
		printk(KERN_ERR "%s: Could not attach to phy\n", dev->name);
		return PTR_ERR(phydev);
		return -ENODEV;
		}

		mac->phydev = phydev;