lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 295/477] powerpc/4xx: Dont unmap NULL mbase
    Date
    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 e6e2adcc7b64c..c13d64c3b0194 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


    \
     
     \ /
      Last update: 2020-06-23 23:32    [W:4.063 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site