lkml.org 
[lkml]   [2021]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 31/35] powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe()
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    [ Upstream commit ffa1797040c5da391859a9556be7b735acbe1242 ]

    I noticed that iounmap() of msgr_block_addr before return from
    mpic_msgr_probe() in the error handling case is missing. So use
    devm_ioremap() instead of just ioremap() when remapping the message
    register block, so the mapping will be automatically released on
    probe failure.

    Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20201028091551.136400-1-miaoqinglang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/sysdev/mpic_msgr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
    index 280e964e1aa88..497e86cfb12e0 100644
    --- a/arch/powerpc/sysdev/mpic_msgr.c
    +++ b/arch/powerpc/sysdev/mpic_msgr.c
    @@ -196,7 +196,7 @@ static int mpic_msgr_probe(struct platform_device *dev)

    /* IO map the message register block. */
    of_address_to_resource(np, 0, &rsrc);
    - msgr_block_addr = ioremap(rsrc.start, resource_size(&rsrc));
    + msgr_block_addr = devm_ioremap(&dev->dev, rsrc.start, resource_size(&rsrc));
    if (!msgr_block_addr) {
    dev_err(&dev->dev, "Failed to iomap MPIC message registers");
    return -EFAULT;
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-01-04 17:02    [W:4.034 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site