Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfd9b85 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

media: omap3isp: Fix memleak in isp_probe 



[ Upstream commit d8fc21c17099635e8ebd986d042be65a6c6b5bd0 ]

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

Fixes: 8644cdf9 ("[media] omap3isp: Replace many MMIO regions by two")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 26c139c2

drivers/media/platform/omap3isp/isp.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -2265,8 +2265,10 @@ static int isp_probe(struct platform_device *pdev) 
		mem = platform_get_resource(pdev, IORESOURCE_MEM, i);

		mem = platform_get_resource(pdev, IORESOURCE_MEM, i);

		isp->mmio_base[map_idx] =

		isp->mmio_base[map_idx] =

			devm_ioremap_resource(isp->dev, mem);

			devm_ioremap_resource(isp->dev, mem);

		if (IS_ERR(isp->mmio_base[map_idx]))

		if (IS_ERR(isp->mmio_base[map_idx])) {

			return PTR_ERR(isp->mmio_base[map_idx]);

			ret = PTR_ERR(isp->mmio_base[map_idx]);

			goto error;

		}

	}

	}





	ret = isp_get_clocks(isp);

	ret = isp_get_clocks(isp);