summaryrefslogtreecommitdiff
path: root/arch/powerpc/sysdev/fsl_pci.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-25 09:40:34 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-01-25 09:40:34 +1100
commit407a362f944a6667fe048db60c04b33b61cd4e86 (patch)
tree94c8b3de88918dc3bb1043172b50c49d45d5f06d /arch/powerpc/sysdev/fsl_pci.c
parent4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518 (diff)
parent621c4b999e3e1dc6f72b0c1680029981edc03caa (diff)
Merge remote-tracking branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
-rw-r--r--arch/powerpc/sysdev/fsl_pci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 3b61e8cf3421..30eb17ecad49 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -205,12 +205,12 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
if (paddr_hi == paddr_lo) {
pr_err("%s: No outbound window space\n", name);
- return ;
+ goto out;
}
if (paddr_lo == 0) {
pr_err("%s: No space for inbound window\n", name);
- return ;
+ goto out;
}
/* setup PCSRBAR/PEXCSRBAR */
@@ -357,6 +357,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
(u64)hose->dma_window_size);
}
+out:
iounmap(pci);
}