diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
| commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
| tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /drivers/net/smsc911x.c | |
| parent | 80595d59ba9917227856e663da249c2276a8628d (diff) | |
| parent | 905db44087855e3c1709f538ecdc22fd149cadd8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000/e1000_main.c
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index aaf0b4314ce2..ae4c74b51827 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -954,7 +954,7 @@ smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktbytes) | |||
| 954 | do { | 954 | do { |
| 955 | udelay(1); | 955 | udelay(1); |
| 956 | val = smsc911x_reg_read(pdata, RX_DP_CTRL); | 956 | val = smsc911x_reg_read(pdata, RX_DP_CTRL); |
| 957 | } while (timeout-- && (val & RX_DP_CTRL_RX_FFWD_)); | 957 | } while (--timeout && (val & RX_DP_CTRL_RX_FFWD_)); |
| 958 | 958 | ||
| 959 | if (unlikely(timeout == 0)) | 959 | if (unlikely(timeout == 0)) |
| 960 | SMSC_WARNING(HW, "Timed out waiting for " | 960 | SMSC_WARNING(HW, "Timed out waiting for " |