---

yaml --- r: 135174 b: refs/heads/master c: 8dacd54 h: refs/heads/master v: v3
git-mirror · Mar 13, 2009 · 5ba6d3b · 5ba6d3b
1 parent fa3134e
commit 5ba6d3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 273ae44b9cb9443e0b5265cdc99f127ddb95c8db
+refs/heads/master: 8dacd548129d03e87751f75ea83b42a8a17ee651
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
@@ -955,7 +955,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 ((val & RX_DP_CTRL_RX_FFWD_) && --timeout);
 
 		if (unlikely(timeout == 0))
 			SMSC_WARNING(HW, "Timed out waiting for "