projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
838d3e7
)
powerpc/4xx: Don't unmap NULL mbase
author
huhai
<huhai@tj.kylinos.cn>
Thu, 21 May 2020 07:26:48 +0000
(17:26 +1000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:50:36 +0000
(17:50 +0200)
[ 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
patch
|
blob
|
history
diff --git
a/arch/powerpc/platforms/4xx/pci.c
b/arch/powerpc/platforms/4xx/pci.c
index
e6e2adc
..
c13d64c
100644
(file)
--- 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 = {