Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202901
b: refs/heads/master
c: b46773d
h: refs/heads/master
i:
  202899: ddcc5b7
v: v3
  • Loading branch information
Jonas Bonn authored and David S. Miller committed Jun 11, 2010
1 parent 68e2b48 commit e03831f
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 2cbc8ef9facf60afa62e04bde91fb5fcac9a5683
refs/heads/master: b46773db64c264a6600f58d9da1ae43708b47fda
5 changes: 4 additions & 1 deletion trunk/drivers/net/ethoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,11 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)

while (time_before(jiffies, timeout)) {
u32 stat = ethoc_read(priv, MIISTATUS);
if (!(stat & MIISTATUS_BUSY))
if (!(stat & MIISTATUS_BUSY)) {
/* reset MII command register */
ethoc_write(priv, MIICOMMAND, 0);
return 0;
}

schedule();
}
Expand Down

0 comments on commit e03831f

Please sign in to comment.