| From ca189d8409f6cd7f7aca85bb68447341263120a1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 21 May 2020 17:26:48 +1000 |
| Subject: powerpc/4xx: Don't unmap NULL mbase |
| |
| From: huhai <huhai@tj.kylinos.cn> |
| |
| [ Upstream commit bcec081ecc940fc38730b29c743bbee661164161 ] |
| |
| Signed-off-by: huhai <huhai@tj.kylinos.cn> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20200521072648.1254699-1-mpe@ellerman.id.au |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/platforms/4xx/pci.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/pci.c |
| index 73e6b36bcd512..256943af58aae 100644 |
| --- a/arch/powerpc/platforms/4xx/pci.c |
| +++ b/arch/powerpc/platforms/4xx/pci.c |
| @@ -1242,7 +1242,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port) |
| if (mbase == NULL) { |
| printk(KERN_ERR "%pOF: Can't map internal config space !", |
| port->node); |
| - goto done; |
| + return; |
| } |
| |
| while (attempt && (0 == (in_le32(mbase + PECFG_460SX_DLLSTA) |
| @@ -1252,9 +1252,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port) |
| } |
| if (attempt) |
| port->link = 1; |
| -done: |
| iounmap(mbase); |
| - |
| } |
| |
| static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = { |
| -- |
| 2.25.1 |
| |
