diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:25:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:25:53 -0800 |
| commit | 2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c (patch) | |
| tree | afe1107cd252595a8d99c292c9f68ee1b5d15364 /arch/sparc64/kernel/isa.c | |
| parent | remove nonsense force-casts from ocfs2 (diff) | |
| parent | [SPARC64]: Update defconfig. (diff) | |
| download | linux-dev-2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c.tar.xz linux-dev-2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC]: Add missing of_node_put
[SPARC64]: check for possible NULL pointer dereference
[SPARC]: Add missing "space"
[SPARC64]: Add missing "space"
[SPARC64]: Add missing pci_dev_put
[SYSCTL_CHECK]: Fix typo in KERN_SPARC_SCONS_PWROFF entry string.
[SPARC64]: Missing mdesc_release() in ldc_init().
Diffstat (limited to 'arch/sparc64/kernel/isa.c')
| -rw-r--r-- | arch/sparc64/kernel/isa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c index 0f19dce1c905..b5f7b354084f 100644 --- a/arch/sparc64/kernel/isa.c +++ b/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; } |