Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200375
b: refs/heads/master
c: 81a95f0
h: refs/heads/master
i:
  200373: 993bec4
  200371: 070af77
  200367: 8e3ef9c
v: v3
  • Loading branch information
Timo Teräs authored and David S. Miller committed Jun 10, 2010
1 parent 7cb874e commit 6dececa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 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: ebedb22d2bacdcf577348eae77ab8f27c9db8ee8
refs/heads/master: 81a95f049962ec20a9aed888e676208b206f0f2e
12 changes: 9 additions & 3 deletions trunk/drivers/net/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,10 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
udelay(25);
}
/*
* Some configurations require a small delay even after the write
* completed indication or the next write might fail.
* According to hardware specs a 20us delay is required after write
* complete indication, but before sending next command.
*/
udelay(25);
udelay(20);
}

static int mdio_read(void __iomem *ioaddr, int reg_addr)
Expand All @@ -583,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
}
udelay(25);
}
/*
* According to hardware specs a 20us delay is required after read
* complete indication, but before sending next command.
*/
udelay(20);

return value;
}

Expand Down

0 comments on commit 6dececa

Please sign in to comment.