From 2df50f9339acff96386a094e59afe60a3549ae14 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 19 Nov 2007 22:50:01 -0800 Subject: [PATCH] --- yaml --- r: 74623 b: refs/heads/master c: 55c45a3ad8e5f9488426332b7baca0261ec2f816 h: refs/heads/master i: 74621: 4f9dd1940281f76b73a6c8eeb0a9623995fa7780 74619: 4d3f5d8ae3a64e2487036154aff3a51cf4137ad2 74615: be86fbe96fc8fb4d1ec68d767707b8991f069020 74607: 0636f1e797fe93d07717ed343f6a71c82a572a2e 74591: 2fb06f3df6798b382ecce4bb6782f7c1e699a8d9 74559: 0912f4b7342dd470533222f09c539145840ed3ba 74495: a29ae2509b7dd646d9b56e2bc0b857bc9c55a3aa v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/isa.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d3bd226f068d..468c8d05e7d3 100644 --- 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 index 0f19dce1c905..b5f7b354084f 100644 --- 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; }