Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Matt Carlson and committed by
David S. Miller
026a6c21 94c982bd

+2 -6
+2 -6
drivers/net/tg3.c
··· 14482 14482 if (err) { 14483 14483 printk(KERN_ERR PFX "Could not obtain valid ethernet address, " 14484 14484 "aborting.\n"); 14485 - goto err_out_fw; 14485 + goto err_out_iounmap; 14486 14486 } 14487 14487 14488 14488 if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { ··· 14491 14491 printk(KERN_ERR PFX "Cannot map APE registers, " 14492 14492 "aborting.\n"); 14493 14493 err = -ENOMEM; 14494 - goto err_out_fw; 14494 + goto err_out_iounmap; 14495 14495 } 14496 14496 14497 14497 tg3_ape_lock_init(tp); ··· 14621 14621 iounmap(tp->aperegs); 14622 14622 tp->aperegs = NULL; 14623 14623 } 14624 - 14625 - err_out_fw: 14626 - if (tp->fw) 14627 - release_firmware(tp->fw); 14628 14624 14629 14625 err_out_iounmap: 14630 14626 if (tp->regs) {