diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2007-10-28 00:22:13 +1000 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-11-01 07:14:09 -0500 |
| commit | 57d75561be5496289601b2c94787ec38c718fcae (patch) | |
| tree | 5be9e7df59be6dba1ba64597fba90009f740729c /arch/ppc | |
| parent | d1dfc35d3a62122b85ca975b80dcbf4a0da0bebc (diff) | |
| download | op-kernel-dev-57d75561be5496289601b2c94787ec38c718fcae.zip op-kernel-dev-57d75561be5496289601b2c94787ec38c718fcae.tar.gz | |
[POWERPC] allocation fix in ppc/platforms/4xx/luan.c
Don't allocate hose2 when when hose1 can't be allocated and free hose1 when
hose2 can't be allocated.
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/platforms/4xx/luan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c index 4b16961..b79ebb8 100644 --- a/arch/ppc/platforms/4xx/luan.c +++ b/arch/ppc/platforms/4xx/luan.c @@ -230,9 +230,14 @@ luan_setup_hoses(void) /* Allocate hoses for PCIX1 and PCIX2 */ hose1 = pcibios_alloc_controller(); + if (!hose1) + return; + hose2 = pcibios_alloc_controller(); - if (!hose1 || !hose2) + if (!hose2) { + pcibios_free_controller(hose1); return; + } /* Setup PCIX1 */ hose1->first_busno = 0; |
