diff options
| author |   Matt Carlson <mcarlson@broadcom.com> | 2009-12-03 08:36:24 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-12-03 13:18:07 -0800 |
| commit | 026a6c21646cf77ea838f3c121de29cdf948ca71 (patch) | |
| tree | 5c4dd0df2e64086464d2091b4f36f547789e0a24 /drivers/net | |
| parent | tg3: Use pci_read_vpd() instead of private method (diff) | |
| download | linux-dev-026a6c21646cf77ea838f3c121de29cdf948ca71.tar.xz linux-dev-026a6c21646cf77ea838f3c121de29cdf948ca71.zip | |
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')
| -rw-r--r-- | drivers/net/tg3.c | 8 |
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, if (err) { printk(KERN_ERR PFX "Could not obtain valid ethernet address, " "aborting.\n"); - goto err_out_fw; + goto err_out_iounmap; } if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { @@ -14491,7 +14491,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, printk(KERN_ERR PFX "Cannot map APE registers, " "aborting.\n"); err = -ENOMEM; - goto err_out_fw; + goto err_out_iounmap; } tg3_ape_lock_init(tp); @@ -14622,10 +14622,6 @@ err_out_apeunmap: tp->aperegs = NULL; } -err_out_fw: - if (tp->fw) - release_firmware(tp->fw); - err_out_iounmap: if (tp->regs) { iounmap(tp->regs); |