From a7c8aa313604e83e54afdee6129fcdfddf1a6a7b Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 26 Sep 2012 19:51:58 +0000
Subject: [PATCH] --- yaml --- r: 323235 b: refs/heads/master c:
 beb5ac20b3f90ffabac1eecd3c00205255df0728 h: refs/heads/master i:   323233:
 495ec1e26328e26e797b827939954be40505a336   323231:
 59e24da63a1af1349dbe25a8c138abfd565d31f7 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/ethernet/pasemi/pasemi_mac.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57473ff474f9..6f56f4afb63f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a326e6dd315ee38c280b7ecf8a0d777952e384cd
+refs/heads/master: beb5ac20b3f90ffabac1eecd3c00205255df0728
diff --git a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c
index e559dfa06d6a..6fa74d530e44 100644
--- a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/trunk/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;