diff options
| author | Michael Chan <mchan@broadcom.com> | 2005-05-05 14:42:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-05 14:42:41 -0700 |
| commit | e6de8ad1fae8385eca4bf288e7a6ea2664ce0458 (patch) | |
| tree | 1b1c2a9ec62be56dc10c2a2e944aa5ffd475ba2d /drivers | |
| parent | b3b7d6be54f919556148946adb4ece91820ad210 (diff) | |
| download | linux-stable-e6de8ad1fae8385eca4bf288e7a6ea2664ce0458.tar.gz linux-stable-e6de8ad1fae8385eca4bf288e7a6ea2664ce0458.tar.bz2 linux-stable-e6de8ad1fae8385eca4bf288e7a6ea2664ce0458.zip | |
[TG3]: Ignore tg3_stop_block() errors.
tg3_stop_block() errors can be safely ignored since tg3_chip_reset()
always follows tg3_stop_block() calls.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e9e0c6e3de50..1d7cdd63babf 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -3725,8 +3725,6 @@ static int tg3_abort_hw(struct tg3 *tp, int silent) err |= tg3_stop_block(tp, SNDDATAC_MODE, SNDDATAC_MODE_ENABLE, silent); err |= tg3_stop_block(tp, DMAC_MODE, DMAC_MODE_ENABLE, silent); err |= tg3_stop_block(tp, SNDBDC_MODE, SNDBDC_MODE_ENABLE, silent); - if (err) - goto out; tp->mac_mode &= ~MAC_MODE_TDE_ENABLE; tw32_f(MAC_MODE, tp->mac_mode); @@ -3744,10 +3742,10 @@ static int tg3_abort_hw(struct tg3 *tp, int silent) printk(KERN_ERR PFX "tg3_abort_hw timed out for %s, " "TX_MODE_ENABLE will not clear MAC_TX_MODE=%08x\n", tp->dev->name, tr32(MAC_TX_MODE)); - return -ENODEV; + err |= -ENODEV; } - err = tg3_stop_block(tp, HOSTCC_MODE, HOSTCC_MODE_ENABLE, silent); + err |= tg3_stop_block(tp, HOSTCC_MODE, HOSTCC_MODE_ENABLE, silent); err |= tg3_stop_block(tp, WDMAC_MODE, WDMAC_MODE_ENABLE, silent); err |= tg3_stop_block(tp, MBFREE_MODE, MBFREE_MODE_ENABLE, silent); @@ -3756,15 +3754,12 @@ static int tg3_abort_hw(struct tg3 *tp, int silent) err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE, silent); err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE, silent); - if (err) - goto out; if (tp->hw_status) memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE); if (tp->hw_stats) memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats)); -out: return err; } @@ -5063,9 +5058,7 @@ static int tg3_reset_hw(struct tg3 *tp) tg3_write_sig_pre_reset(tp, RESET_KIND_INIT); if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) { - err = tg3_abort_hw(tp, 1); - if (err) - return err; + tg3_abort_hw(tp, 1); } err = tg3_chip_reset(tp); |