From 6dececa72360d0625bd099eeb699b270a6c10e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Wed, 9 Jun 2010 17:31:48 -0700 Subject: [PATCH] --- yaml --- r: 200375 b: refs/heads/master c: 81a95f049962ec20a9aed888e676208b206f0f2e h: refs/heads/master i: 200373: 993bec4ddfe657530101181e34b7adcb696e2e2f 200371: 070af770d241361a6915cb8af877e8a246b4e264 200367: 8e3ef9c92b6cd24f927186d799b41061b755f31c v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf3e7745e34a..60d2bec2fc6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebedb22d2bacdcf577348eae77ab8f27c9db8ee8 +refs/heads/master: 81a95f049962ec20a9aed888e676208b206f0f2e diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 03a8318d90a2..96b6cfbf0a3a 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -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) @@ -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; }