Commit:     aaf84465fc994e9a840a8c0c6fa842b54cdb3426
Parent:     989a9d239c5b9ae6053aed6e3819304930baf27d
Author:     Gary Zambrano <[EMAIL PROTECTED]>
AuthorDate: Sat May 5 11:51:45 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat May 5 11:51:45 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Michael Chan <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 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 */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to