diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-26 23:51:58 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-27 21:20:50 +0400 |
| commit | beb5ac20b3f90ffabac1eecd3c00205255df0728 (patch) | |
| tree | ee86bc4c43c47460b2880f89205ce1fb86c87e70 | |
| parent | a326e6dd315ee38c280b7ecf8a0d777952e384cd (diff) | |
| download | linux-beb5ac20b3f90ffabac1eecd3c00205255df0728.tar.xz | |
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>
| -rw-r--r-- | drivers/net/ethernet/pasemi/pasemi_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index e559dfa06d6a..6fa74d530e44 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -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; |