diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 23:30:18 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 23:30:18 +0300 |
commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/mach-iop13xx | |
parent | ed40d0c472b136682b2fcba05f89762859c7374f (diff) | |
parent | f0bba9f934517533acbda7329be93f55d5a01c03 (diff) | |
download | linux-9759d22c8348343b0da4e25d6150c41712686c14.tar.xz |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c index 673b0db22034..4873f26a42e1 100644 --- a/arch/arm/mach-iop13xx/pci.c +++ b/arch/arm/mach-iop13xx/pci.c @@ -1026,8 +1026,10 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) which_atu = 0; } - if (!which_atu) + if (!which_atu) { + kfree(res); return 0; + } switch(which_atu) { case IOP13XX_INIT_ATU_ATUX: @@ -1074,6 +1076,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) sys->map_irq = iop13xx_pcie_map_irq; break; default: + kfree(res); return 0; } |