---

yaml --- r: 323235 b: refs/heads/master c: beb5ac2 h: refs/heads/master i: 323233: 495ec1e 323231: 59e24da v: v3
git-mirror · Sep 27, 2012 · a7c8aa3 · a7c8aa3
1 parent fa7e9ed
commit a7c8aa3
Show file tree

Hide file tree

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