devices/e1000/e1000_main-2.6.31-ethercat.c
changeset 2163 d6d49dcaf7a5
parent 1996 852668fdae6a
child 2211 2a009dc7bd1c
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c	Wed Nov 23 15:07:42 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.31-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3804,7 +3804,7 @@
 		int i, ec_work_done = 0;
 		for (i = 0; i < E1000_MAX_INTR; i++) {
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-						&ec_work_done, 100) &
+						&ec_work_done, 100) &&
 					!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 				break;
 			}