From d1d985b2bd23034ca41d98e2a0eecb3584c1fdbd Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Sat, 13 Apr 2013 15:14:41 +0800 Subject: [PATCH] --- yaml --- r: 370872 b: refs/heads/master c: 04aa99cd0dff7c13bc4b441c23af08ac5c7838e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/fsl_pci.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3a74cfcd62d5..311eb3fc9083 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aa171fbc02bf6797a05835033aa97744ac04c02 +refs/heads/master: 04aa99cd0dff7c13bc4b441c23af08ac5c7838e1 diff --git a/trunk/arch/powerpc/sysdev/fsl_pci.c b/trunk/arch/powerpc/sysdev/fsl_pci.c index 40ffe29b7594..cf81d6516514 100644 --- a/trunk/arch/powerpc/sysdev/fsl_pci.c +++ b/trunk/arch/powerpc/sysdev/fsl_pci.c @@ -244,12 +244,12 @@ static void setup_pci_atmu(struct pci_controller *hose) if (paddr_hi == paddr_lo) { pr_err("%s: No outbound window space\n", name); - goto out; + return; } if (paddr_lo == 0) { pr_err("%s: No space for inbound window\n", name); - goto out; + return; } /* setup PCSRBAR/PEXCSRBAR */ @@ -395,9 +395,6 @@ static void setup_pci_atmu(struct pci_controller *hose) pr_info("%s: DMA window size is 0x%llx\n", name, (u64)hose->dma_window_size); } - -out: - iounmap(pci); } static void __init setup_pci_cmd(struct pci_controller *hose)