Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/romieu/netdev-2.6
niw · Jun 24, 2011 · 4d03b44 · 4d03b44
2 parents acc468f + 1e4e82b
commit 4d03b44
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 	}