summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-11-04 09:15:01 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-04 17:31:47 -0400
commit5bc09186deba2a016b60aa3923fc0e42838ce877 (patch)
treee16110c073141e90e5f679fd2f385d8e1278e47b /drivers
parentba1142e4fb291c7bf124d93596351dca8d226a0f (diff)
downloadlinux-stable-5bc09186deba2a016b60aa3923fc0e42838ce877.tar.gz
linux-stable-5bc09186deba2a016b60aa3923fc0e42838ce877.tar.bz2
linux-stable-5bc09186deba2a016b60aa3923fc0e42838ce877.zip
tg3: Fix irq alloc error cleanup path
This patch fixes a bug where the irq error cleanup path did not free all the resources it allocated. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Ben Li <benli@broadcom.com> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3a7517910eed..0413e1e85641 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -9677,15 +9677,14 @@ static int tg3_open(struct net_device *dev)
struct tg3_napi *tnapi = &tp->napi[i];
err = tg3_request_irq(tp, i);
if (err) {
- for (i--; i >= 0; i--)
+ for (i--; i >= 0; i--) {
+ tnapi = &tp->napi[i];
free_irq(tnapi->irq_vec, tnapi);
- break;
+ }
+ goto err_out2;
}
}
- if (err)
- goto err_out2;
-
tg3_full_lock(tp, 0);
err = tg3_init_hw(tp, 1);