From ad901d0143cd0b0c70cdfc3ab30aad37d674c4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sun, 6 Jun 2010 15:38:47 -0700
Subject: [PATCH] --- yaml --- r: 200263 b: refs/heads/master c:
 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e h: refs/heads/master i:   200261:
 0dde9c56f1f5d9a41bd5d2078b67f5e373e4e48f   200259:
 9d882a08a6691f40051d5a5342287cff207487cb   200255:
 634d2790e6edcaa0763343226691030d341e1090 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fca4c6a5ba24..4b284d7153e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ffb335e8d696affc04f963bf73ce2196f80edb9
+refs/heads/master: 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 217e709bda3e..03a8318d90a2 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/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)