diff options
| author | Aaro Koskinen <Aaro.Koskinen@nokia.com> | 2011-03-14 12:28:32 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 11:14:34 -0700 |
| commit | da4a0f764a6017659bf32505bbd773f561eaf605 (patch) | |
| tree | eaa500c6cb4f137d0144ba036d213fb6a06a3fff | |
| parent | b235e007831dbf57710e59cd4a120e2f374eecb9 (diff) | |
| download | op-kernel-dev-da4a0f764a6017659bf32505bbd773f561eaf605.zip op-kernel-dev-da4a0f764a6017659bf32505bbd773f561eaf605.tar.gz | |
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: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/plat-omap/iommu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index e3eb038..8a51fd5 100644 --- a/arch/arm/plat-omap/iommu.c +++ b/arch/arm/plat-omap/iommu.c @@ -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: |
