From 93b5731b07c56039aafa82dd1fc2848254070368 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 3 Dec 2009 08:36:24 +0000 Subject: [PATCH] --- yaml --- r: 172139 b: refs/heads/master c: 026a6c21646cf77ea838f3c121de29cdf948ca71 h: refs/heads/master i: 172137: d016ba7c4e80b8019397576395dfedba5e1fcd65 172135: fd3eae2f206035d6c2fec39a95f1198c3251b663 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 634770254fdc..70ea50b66d3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94c982bd9f07b801f03cebe32b20f893b4ad6d27 +refs/heads/master: 026a6c21646cf77ea838f3c121de29cdf948ca71 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index f41debcf2025..13c96bf14a98 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/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 @@ 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);