Commit 57d75561 authored Oct 28, 2007 by Roel Kluin Committed by Josh Boyer Nov 01, 2007

[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>

parent d1dfc35d

arch/ppc/platforms/4xx/luan.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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;