summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorGary Zambrano <zambrano@broadcom.com>2007-05-05 11:51:45 -0700
committerDavid S. Miller <davem@davemloft.net>2007-05-05 11:51:45 -0700
commitaaf84465fc994e9a840a8c0c6fa842b54cdb3426 (patch)
treea764093806574e4e0416b5ee775d096bc9cf7f13 /drivers/net
parent989a9d239c5b9ae6053aed6e3819304930baf27d (diff)
downloadlinux-3.10-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.tar.gz
linux-3.10-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.tar.bz2
linux-3.10-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.zip
[TG3]: Clear GPIO mask before storing.
The GPIO settings may change during reset and so the stored values in tp->grc_local_ctrl should be cleared first. Signed-off-by: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c01bd861ac5..00027a14eaa 100644
--- a/drivers/net/tg3.c
+++ b/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 */