diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 16:58:26 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 16:58:26 -0800 |
| commit | 327641da8e3e227f42690479182b896fd19486be (patch) | |
| tree | 05fa7f317e854f2da5d46d4c8977486d71bb2b21 /drivers/net/smsc911x.c | |
| parent | 1f4f931501e9270c156d05ee76b7b872de486304 (diff) | |
| parent | ef3892bd63420380d115f755d351d2071f1f805f (diff) | |
Merge branch 'core/percpu' into x86/paravirt
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 f513bdf1c88..783c1a7b869 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -953,7 +953,7 @@ smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktbytes) do { udelay(1); val = smsc911x_reg_read(pdata, RX_DP_CTRL); - } while (timeout-- && (val & RX_DP_CTRL_RX_FFWD_)); + } while (--timeout && (val & RX_DP_CTRL_RX_FFWD_)); if (unlikely(timeout == 0)) SMSC_WARNING(HW, "Timed out waiting for " |