---

yaml --- r: 19863 b: refs/heads/master c: d28d487 h: refs/heads/master i: 19861: 560d246 19859: 1b325d6 19855: 11f5b40 v: v3
git-mirror · Feb 7, 2006 · cb1f4e5 · cb1f4e5
1 parent 4aacdd1
commit cb1f4e5
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: 2d42d21f11c20b94ea0222637e20e2630845afe4
+refs/heads/master: d28d4870279c5d184804b6ac1775b130972ffecd
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -2847,7 +2847,7 @@ static int sky2_set_coalesce(struct net_device *dev,
 	if (ecmd->rx_coalesce_usecs_irq == 0)
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_STOP);
 	else {
-		sky2_write32(hw, STAT_TX_TIMER_INI,
+		sky2_write32(hw, STAT_ISR_TIMER_INI,
 			     sky2_us2clk(hw, ecmd->rx_coalesce_usecs_irq));
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
 	}