[TG3]: Set GRC_MISC_CFG prescaler more safely.

8d01d75f · David S. Miller · 99e81246 · 8d01d75f
Commit 8d01d75f authored Mar 30, 2004 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

drivers/net/tg3.c drivers/net/tg3.c +4 -2

No files found.
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4602,8 +4602,10 @@ static int tg3_reset_hw(struct tg3 *tp)
 	     (GRC_MODE_IRQ_ON_MAC_ATTN | GRC_MODE_HOST_STACKUP));
 	/* Setup the timer prescalar register.  Clock is always 66Mhz. */
-	tw32(GRC_MISC_CFG,
+	val = tr32(GRC_MISC_CFG);
-	     (65 << GRC_MISC_CFG_PRESCALAR_SHIFT));
+	val &= ~0xff;
+	val |= (65 << GRC_MISC_CFG_PRESCALAR_SHIFT);
+	tw32(GRC_MISC_CFG, val);
 	/* Initialize MBUF/DESC pool. */
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {