Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266396
b: refs/heads/master
c: 6fe3264
h: refs/heads/master
v: v3
  • Loading branch information
David Daney authored and David S. Miller committed Sep 30, 2011
1 parent fc05f85 commit 8552969
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 8e00f5fbb4ecbc3431fa686cba60cd76a62604af
refs/heads/master: 6fe3264945ee63292cdfb27b6e95bc52c603bb09
4 changes: 2 additions & 2 deletions trunk/drivers/net/phy/phy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)

/* Grab the bits from PHYIR1, and put them
* in the upper half */
phy_reg = bus->read(bus, addr, MII_PHYSID1);
phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);

if (phy_reg < 0)
return -EIO;

*phy_id = (phy_reg & 0xffff) << 16;

/* Grab the bits from PHYIR2, and put them in the lower half */
phy_reg = bus->read(bus, addr, MII_PHYSID2);
phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);

if (phy_reg < 0)
return -EIO;
Expand Down

0 comments on commit 8552969

Please sign in to comment.