diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
| commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
| tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/net/r8169.c | |
| parent | 7329f0d58de01878d9ce4f0be7a76e136f223eef (diff) | |
| parent | 712ae51afd55b20c04c5383d02ba5d10233313b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index fbd68383ca60..ef1a43dd145b 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -753,7 +753,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd) | |||
| 753 | msleep(2); | 753 | msleep(2); |
| 754 | for (i = 0; i < 5; i++) { | 754 | for (i = 0; i < 5; i++) { |
| 755 | udelay(100); | 755 | udelay(100); |
| 756 | if (!(RTL_R32(ERIDR) & ERIAR_FLAG)) | 756 | if (!(RTL_R32(ERIAR) & ERIAR_FLAG)) |
| 757 | break; | 757 | break; |
| 758 | } | 758 | } |
| 759 | 759 | ||