Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6

4d03b446 · David S. Miller · acc468f5 · 1e4e82ba · 4d03b446
Commit 4d03b446 authored Jun 24, 2011 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/net/r8169.c drivers/net/r8169.c +1 -1

No files found.
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -742,7 +742,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)
 	msleep(2);
 	for (i = 0; i < 5; i++) {
 		udelay(100);
-		if (!(RTL_R32(ERIDR) & ERIAR_FLAG))
+		if (!(RTL_R32(ERIAR) & ERIAR_FLAG))
 			break;
 	}