From e330d8697e3ce117340cce82fcd09b5bef7905be Mon Sep 17 00:00:00 2001
From: Gary Zambrano <zambrano@broadcom.com>
Date: Sat, 5 May 2007 11:51:45 -0700
Subject: [PATCH] --- yaml --- r: 53712 b: refs/heads/master c:
 aaf84465fc994e9a840a8c0c6fa842b54cdb3426 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7d56f30a9ca2..c06b8ab64ccd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989a9d239c5b9ae6053aed6e3819304930baf27d
+refs/heads/master: aaf84465fc994e9a840a8c0c6fa842b54cdb3426
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index c01bd861ac5e..00027a14eaa1 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6454,6 +6454,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
 			gpio_mask |= GRC_LCLCTRL_GPIO_UART_SEL;
 
+		tp->grc_local_ctrl &= ~gpio_mask;
 		tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
 
 		/* GPIO1 must be driven high for eeprom write protect */