diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/sparc64/kernel/isa.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
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) | |||
| 155 | isa_br = kzalloc(sizeof(*isa_br), GFP_KERNEL); | 155 | isa_br = kzalloc(sizeof(*isa_br), GFP_KERNEL); |
| 156 | if (!isa_br) { | 156 | if (!isa_br) { |
| 157 | printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge"); | 157 | printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge"); |
| 158 | pci_dev_put(pdev); | ||
| 158 | return; | 159 | return; |
| 159 | } | 160 | } |
| 160 | 161 | ||
| @@ -168,6 +169,7 @@ void __init isa_init(void) | |||
| 168 | printk(KERN_DEBUG "isa: device registration error for %s!\n", | 169 | printk(KERN_DEBUG "isa: device registration error for %s!\n", |
| 169 | dp->path_component_name); | 170 | dp->path_component_name); |
| 170 | kfree(isa_br); | 171 | kfree(isa_br); |
| 172 | pci_dev_put(pdev); | ||
| 171 | return; | 173 | return; |
| 172 | } | 174 | } |
| 173 | 175 | ||