Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 026a6c21 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

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: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94c982bd

drivers/net/tg3.c

+2 −6
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
		tp->aperegs = NULL;

	}



err_out_fw:

	if (tp->fw)

		release_firmware(tp->fw);



err_out_iounmap:

	if (tp->regs) {

		iounmap(tp->regs);