---

yaml --- r: 203471 b: refs/heads/master c: b31fb86 h: refs/heads/master i: 203469: d0ffe45 203467: a6bb3a2 203463: 5c763fe 203455: 84cd84a v: v3
git-mirror · Jul 13, 2010 · 389a2d7 · 389a2d7
1 parent b944b7e
commit 389a2d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60eb5fd11d1c6050c45a5aab141f42dd396e2a7f
+refs/heads/master: b31fb86815153be3bc94e8ffb9dbf6e9d7694b2d
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;
+		goto err_out_iounmap;
 
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 	printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
@@ -872,6 +872,8 @@ 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;