---

yaml --- r: 74623 b: refs/heads/master c: 55c45a3 h: refs/heads/master i: 74621: 4f9dd19 74619: 4d3f5d8 74615: be86fbe 74607: 0636f1e 74591: 2fb06f3 74559: 0912f4b 74495: a29ae25 v: v3
git-mirror · Dec 5, 2007 · 2df50f9 · 2df50f9
1 parent 5b09061
commit 2df50f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 874a5f87f53f80b798140b07fcf81f8d3718b3cc
+refs/heads/master: 55c45a3ad8e5f9488426332b7baca0261ec2f816
diff --git a/trunk/arch/sparc64/kernel/isa.c b/trunk/arch/sparc64/kernel/isa.c
@@ -155,6 +155,7 @@ void __init isa_init(void)
 		isa_br = kzalloc(sizeof(*isa_br), GFP_KERNEL);
 		if (!isa_br) {
 			printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge");
+			pci_dev_put(pdev);
 			return;
 		}
 
@@ -168,6 +169,7 @@ void __init isa_init(void)
 			printk(KERN_DEBUG "isa: device registration error for %s!\n",
 			       dp->path_component_name);
 			kfree(isa_br);
+			pci_dev_put(pdev);
 			return;
 		}