| commit | 4d03b446d2f09469cb731200577322eff660b204 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jun 24 14:33:01 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jun 24 14:33:01 2011 -0700 |
| tree | d4a12de8a026000055883fa4e102e71438fde0d8 | |
| parent | acc468f5f9616ba564b772ac8a3aef218bff6bb3 [diff] | |
| parent | 1e4e82baee8c2a8d753cbf6aa1a77326b71e59f0 [diff] |
Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 05d8178..5990621 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c
@@ -742,7 +742,7 @@ msleep(2); for (i = 0; i < 5; i++) { udelay(100); - if (!(RTL_R32(ERIDR) & ERIAR_FLAG)) + if (!(RTL_R32(ERIAR) & ERIAR_FLAG)) break; }