lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] allocation fix in ppc/platforms/4xx/luan.c

Browse Source 
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>
This commit is contained in:
Roel Kluin
2007-10-28 00:22:13 +10:00
committed by Josh Boyer
parent d1dfc35d3a
commit 57d75561be
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ppc/platforms/4xx/luan.c
View File

@@ -230,10 +230,15 @@ luan_setup_hoses(void)
/* Allocate hoses for PCIX1 and PCIX2 */ /* Allocate hoses for PCIX1 and PCIX2 */
hose1 = pcibios_alloc_controller(); hose1 = pcibios_alloc_controller();
hose2 = pcibios_alloc_controller(); if (!hose1)
if (!hose1 || !hose2)
return; return;
hose2 = pcibios_alloc_controller();
if (!hose2) {
pcibios_free_controller(hose1);
return;
}
/* Setup PCIX1 */ /* Setup PCIX1 */
hose1->first_busno = 0; hose1->first_busno = 0;
hose1->last_busno = 0xff; hose1->last_busno = 0xff;