From 8014351b51fac4788a5b1514068a032c560bbf0c Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 27 Sep 2012 19:04:21 +0000
Subject: [PATCH] --- yaml --- r: 323241 b: refs/heads/master c:
 df555b665367f9de6c04826acc482096f17c243d h: refs/heads/master i:   323239:
 568695d43bf8c7d3ccdf6de5c8ae61d1813880db v: v3

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

diff --git a/[refs] b/[refs]
index 73cde0c68992..3f4b4f0e4ff5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc9259a8bae9e814fc1f775a1b3effa13e6ad330
+refs/heads/master: df555b665367f9de6c04826acc482096f17c243d
diff --git a/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c b/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c
index c42bbb16cdae..a688a2ddcfd6 100644
--- a/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -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);