tg3: Clean tg3_init_one()
Subsystems (2)
PATCH 5/6 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 <[email protected]>
Reviewed-by Michael Chan <[email protected]>
--- drivers/net/tg3.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
drivers/net/tg3.c +2 -6
@@ -14483,7 +14483,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 ) {
@@ -14492,7 +14492,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);
@@ -14623,10 +14623,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);
Signature · 1 line
1.6.4.4