diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-24 17:33:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-24 17:33:01 -0400 |
| commit | 4d03b446d2f09469cb731200577322eff660b204 (patch) | |
| tree | d4a12de8a026000055883fa4e102e71438fde0d8 /drivers/net | |
| parent | acc468f5f9616ba564b772ac8a3aef218bff6bb3 (diff) | |
| parent | 1e4e82baee8c2a8d753cbf6aa1a77326b71e59f0 (diff) | |
Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
Diffstat (limited to 'drivers/net')
| -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 05d81780d1fd..5990621fb5cd 100644 --- 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) | |||
| 742 | msleep(2); | 742 | msleep(2); |
| 743 | for (i = 0; i < 5; i++) { | 743 | for (i = 0; i < 5; i++) { |
| 744 | udelay(100); | 744 | udelay(100); |
| 745 | if (!(RTL_R32(ERIDR) & ERIAR_FLAG)) | 745 | if (!(RTL_R32(ERIAR) & ERIAR_FLAG)) |
| 746 | break; | 746 | break; |
| 747 | } | 747 | } |
| 748 | 748 | ||