Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45054
b: refs/heads/master
c: 3e65bb9
h: refs/heads/master
v: v3
  • Loading branch information
Hynek Petrak authored and Jeff Garzik committed Dec 26, 2006
1 parent 7b02e5c commit 5fb7193
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebf5112ca7a714a3961a322459747059cbf41d7b
refs/heads/master: 3e65bb94a9de542c464bf00035a08b0e0a76993d
4 changes: 3 additions & 1 deletion trunk/drivers/net/ibm_emac/ibm_emac_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 5fb7193

Please sign in to comment.