aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2009-12-03 03:36:24 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:07 -0500
commit026a6c21646cf77ea838f3c121de29cdf948ca71 (patch)
tree5c4dd0df2e64086464d2091b4f36f547789e0a24 /drivers/net/tg3.c
parent94c982bd9f07b801f03cebe32b20f893b4ad6d27 (diff)
tg3: Clean tg3_init_one()
Tg3's firmware is no longer loaded from tg3_init_one(). Remove the error path that releases the firmware back to the system. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f41debcf2025..13c96bf14a98 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -14482,7 +14482,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
14482 if (err) { 14482 if (err) {
14483 printk(KERN_ERR PFX "Could not obtain valid ethernet address, " 14483 printk(KERN_ERR PFX "Could not obtain valid ethernet address, "
14484 "aborting.\n"); 14484 "aborting.\n");
14485 goto err_out_fw; 14485 goto err_out_iounmap;
14486 } 14486 }
14487 14487
14488 if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { 14488 if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) {
@@ -14491,7 +14491,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
14491 printk(KERN_ERR PFX "Cannot map APE registers, " 14491 printk(KERN_ERR PFX "Cannot map APE registers, "
14492 "aborting.\n"); 14492 "aborting.\n");
14493 err = -ENOMEM; 14493 err = -ENOMEM;
14494 goto err_out_fw; 14494 goto err_out_iounmap;
14495 } 14495 }
14496 14496
14497 tg3_ape_lock_init(tp); 14497 tg3_ape_lock_init(tp);
@@ -14622,10 +14622,6 @@ err_out_apeunmap:
14622 tp->aperegs = NULL; 14622 tp->aperegs = NULL;
14623 } 14623 }
14624 14624
14625err_out_fw:
14626 if (tp->fw)
14627 release_firmware(tp->fw);
14628
14629err_out_iounmap: 14625err_out_iounmap:
14630 if (tp->regs) { 14626 if (tp->regs) {
14631 iounmap(tp->regs); 14627 iounmap(tp->regs);