Fixed accidentially used operator & by using &&. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Wed, 23 Nov 2011 15:11:07 +0100
branchstable-1.5
changeset 2203 0e85057a70fb
parent 2202 14728d0c4a66
child 2204 1abb01002cc5
Fixed accidentially used operator & by using &&.
devices/e1000/e1000_main-2.6.31-ethercat.c
devices/e1000/e1000_main-2.6.33-ethercat.c
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c	Thu Dec 15 14:05:44 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;
 			}
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c	Thu Dec 15 14:05:44 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3468,7 +3468,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;
 			}