---

yaml --- r: 203490 b: refs/heads/master c: 1e2cfee h: refs/heads/master v: v3
git-mirror · Jul 13, 2010 · 9b8b499 · 9b8b499
1 parent 3e6aad5
commit 9b8b499
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28bd620c7a1244e59459d6293ca11f162e0a67b9
+refs/heads/master: 1e2cfeef060fa0270f9a2d66b1218c12c05062e0
diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c
@@ -854,7 +854,7 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
 
 	rc = register_netdev(dev);
 	if (rc)
-		goto err_out_iounmap;
+		goto err_out;
 
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 	printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
@@ -872,8 +872,6 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
 
 err_out_unregister:
 	unregister_netdev(dev);
-err_out_iounmap:
-	pcim_iounmap_regions(pdev, 1 << 1);
 err_out:
 	free_netdev(dev);
 	return rc;