Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / arm / mach-iop13xx / pci.c

diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 673b0db..4873f26 100644 (file)
--- 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;
        }