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

Commit da4a0f76 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Tony Lindgren
Browse files

arm: plat-omap: iommu: fix request_mem_region() error path 



request_mem_region() error exit will leak ioremapped memory. Fix this
by moving the ioremap() after request_mem_region(), which is the proper
order to do this anyway.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b235e007

arch/arm/plat-omap/iommu.c

+8 −6
Original line number Diff line number Diff line
@@ -982,11 +982,6 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
		err = -ENODEV;

		goto err_mem;

	}

	obj->regbase = ioremap(res->start, resource_size(res));

	if (!obj->regbase) {

		err = -ENOMEM;

		goto err_mem;

	}



	res = request_mem_region(res->start, resource_size(res),

				 dev_name(&pdev->dev));
@@ -995,6 +990,12 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
		goto err_mem;

	}



	obj->regbase = ioremap(res->start, resource_size(res));

	if (!obj->regbase) {

		err = -ENOMEM;

		goto err_ioremap;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		err = -ENODEV;
@@ -1023,8 +1024,9 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
err_pgd:

	free_irq(irq, obj);

err_irq:

	release_mem_region(res->start, resource_size(res));

	iounmap(obj->regbase);

err_ioremap:

	release_mem_region(res->start, resource_size(res));

err_mem:

	clk_put(obj->clk);

err_clk: