diff options
| author | Gary Zambrano <zambrano@broadcom.com> | 2007-05-05 11:51:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-05-05 11:51:45 -0700 |
| commit | aaf84465fc994e9a840a8c0c6fa842b54cdb3426 (patch) | |
| tree | a764093806574e4e0416b5ee775d096bc9cf7f13 /drivers/net | |
| parent | 989a9d239c5b9ae6053aed6e3819304930baf27d (diff) | |
| download | kernel_samsung_smdk4412-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.zip kernel_samsung_smdk4412-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.tar.gz kernel_samsung_smdk4412-aaf84465fc994e9a840a8c0c6fa842b54cdb3426.tar.bz2 | |
[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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index c01bd86..00027a1 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 */ |