Skip to content

Commit d8fc21c

Browse files
dinghaoliumchehab
authored andcommitted
media: omap3isp: Fix memleak in isp_probe
When devm_ioremap_resource() fails, isp should be freed just like other error paths in isp_probe. Fixes: 8644cdf ("[media] omap3isp: Replace many MMIO regions by two") Signed-off-by: Dinghao Liu <[email protected]> Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 08913a8 commit d8fc21c

File tree

1 file changed

+4
-2
lines changed
  • drivers/media/platform/omap3isp

1 file changed

+4
-2
lines changed

drivers/media/platform/omap3isp/isp.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -2328,8 +2328,10 @@ static int isp_probe(struct platform_device *pdev)
23282328
mem = platform_get_resource(pdev, IORESOURCE_MEM, i);
23292329
isp->mmio_base[map_idx] =
23302330
devm_ioremap_resource(isp->dev, mem);
2331-
if (IS_ERR(isp->mmio_base[map_idx]))
2332-
return PTR_ERR(isp->mmio_base[map_idx]);
2331+
if (IS_ERR(isp->mmio_base[map_idx])) {
2332+
ret = PTR_ERR(isp->mmio_base[map_idx]);
2333+
goto error;
2334+
}
23332335
}
23342336

23352337
ret = isp_get_clocks(isp);

0 commit comments

Comments
 (0)