summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 20:30:18 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 20:30:18 +0000
commit9759d22c8348343b0da4e25d6150c41712686c14 (patch)
tree338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/mach-iop13xx
parented40d0c472b136682b2fcba05f89762859c7374f (diff)
parentf0bba9f934517533acbda7329be93f55d5a01c03 (diff)
downloadop-kernel-dev-9759d22c8348343b0da4e25d6150c41712686c14.zip
op-kernel-dev-9759d22c8348343b0da4e25d6150c41712686c14.tar.gz
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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 673b0db..4873f26 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;
}
OpenPOWER on IntegriCloud