---

yaml --- r: 288370 b: refs/heads/master c: 7831545 h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · 7fe1848 · 7fe1848
1 parent 8ea2b41
commit 7fe1848
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: 5200959b833ddacf28b6ffce8c331dfd6e0ca797
+refs/heads/master: 783154573236f46b730b2eea17d2e6e04bdb3251
diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1710,7 +1710,7 @@ static irqreturn_t atl1c_intr(int irq, void *data)
 					"atl1c hardware error (status = 0x%x)\n",
 					status & ISR_ERROR);
 			/* reset MAC */
-			adapter->work_event |= ATL1C_WORK_EVENT_RESET;
+			set_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event);
 			schedule_work(&adapter->common_task);
 			return IRQ_HANDLED;
 		}