Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / net / r8169.c

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index ca93cdf002a70bc4474c369886407837ae41d9a8..6949504589dbb1ecb48bfbb230ef652e7b0342f0 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
                        break;
                udelay(25);
        }
+       /*
+        * Some configurations require a small delay even after the write
+        * completed indication or the next write might fail.
+        */
+       udelay(25);
 }
 
 static int mdio_read(void __iomem *ioaddr, int reg_addr)