---

yaml --- r: 172139 b: refs/heads/master c: 026a6c2 h: refs/heads/master i: 172137: d016ba7 172135: fd3eae2 v: v3
git-mirror · Dec 3, 2009 · 93b5731 · 93b5731
1 parent e70bc57
commit 93b5731
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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);