From 5fb7193dc3376c27e052b2793877863fb213c20c Mon Sep 17 00:00:00 2001
From: Hynek Petrak <hynek@swac.cz>
Date: Tue, 19 Dec 2006 13:08:49 -0800
Subject: [PATCH] --- yaml --- r: 45054 b: refs/heads/master c:
 3e65bb94a9de542c464bf00035a08b0e0a76993d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 977f6eacc89a..dbfe2170cba3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebf5112ca7a714a3961a322459747059cbf41d7b
+refs/heads/master: 3e65bb94a9de542c464bf00035a08b0e0a76993d
diff --git a/trunk/drivers/net/ibm_emac/ibm_emac_phy.c b/trunk/drivers/net/ibm_emac/ibm_emac_phy.c
index 4a97024061e5..9074f76ee2bf 100644
--- a/trunk/drivers/net/ibm_emac/ibm_emac_phy.c
+++ b/trunk/drivers/net/ibm_emac/ibm_emac_phy.c
@@ -309,7 +309,7 @@ int mii_phy_probe(struct mii_phy *phy, int address)
 {
 	struct mii_phy_def *def;
 	int i;
-	u32 id;
+	int id;
 
 	phy->autoneg = AUTONEG_DISABLE;
 	phy->advertising = 0;
@@ -324,6 +324,8 @@ int mii_phy_probe(struct mii_phy *phy, int address)
 
 	/* Read ID and find matching entry */
 	id = (phy_read(phy, MII_PHYSID1) << 16) | phy_read(phy, MII_PHYSID2);
+	if (id < 0)
+		return -ENODEV;
 	for (i = 0; (def = mii_phy_table[i]) != NULL; i++)
 		if ((id & def->phy_id_mask) == def->phy_id)
 			break;