---

yaml --- r: 323241 b: refs/heads/master c: df555b6 h: refs/heads/master i: 323239: 568695d v: v3
git-mirror · Sep 28, 2012 · 8014351 · 8014351
1 parent 15bcc44
commit 8014351
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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);