lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 048/264] media: omap3isp: Fix memleak in isp_probe
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit d8fc21c17099635e8ebd986d042be65a6c6b5bd0 ]

    When devm_ioremap_resource() fails, isp should be
    freed just like other error paths in isp_probe.

    Fixes: 8644cdf972dd6 ("[media] omap3isp: Replace many MMIO regions by two")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/omap3isp/isp.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
    index addd03b517481..00e52f0b8251b 100644
    --- a/drivers/media/platform/omap3isp/isp.c
    +++ b/drivers/media/platform/omap3isp/isp.c
    @@ -2265,8 +2265,10 @@ static int isp_probe(struct platform_device *pdev)
    mem = platform_get_resource(pdev, IORESOURCE_MEM, i);
    isp->mmio_base[map_idx] =
    devm_ioremap_resource(isp->dev, mem);
    - if (IS_ERR(isp->mmio_base[map_idx]))
    - return PTR_ERR(isp->mmio_base[map_idx]);
    + if (IS_ERR(isp->mmio_base[map_idx])) {
    + ret = PTR_ERR(isp->mmio_base[map_idx]);
    + goto error;
    + }
    }

    ret = isp_get_clocks(isp);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:22    [W:4.046 / U:1.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site