lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller
2011-06-24 14:33:01 -07:00
parent acc468f5f9 1e4e82baee
commit 4d03b446d2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/r8169.c
View File

@@ -742,7 +742,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)
msleep(2); msleep(2);
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
udelay(100); udelay(100);
if (!(RTL_R32(ERIDR) & ERIAR_FLAG)) if (!(RTL_R32(ERIAR) & ERIAR_FLAG))
break; break;
} }