Skip to content

Commit 0e97077

Browse files
ArvindYadavCsgregkh
authored andcommitted
exynos4-is: fimc-is: Unmap region obtained by of_iomap()
[ Upstream commit 4742575cde1f3cee0ea6b41af42781672315b04b ] Free memory mapping, if fimc_is_probe is not successful. Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2d097e5 commit 0e97077

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/media/platform/exynos4-is/fimc-is.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,12 +815,13 @@ static int fimc_is_probe(struct platform_device *pdev)
815815
is->irq = irq_of_parse_and_map(dev->of_node, 0);
816816
if (!is->irq) {
817817
dev_err(dev, "no irq found\n");
818-
return -EINVAL;
818+
ret = -EINVAL;
819+
goto err_iounmap;
819820
}
820821

821822
ret = fimc_is_get_clocks(is);
822823
if (ret < 0)
823-
return ret;
824+
goto err_iounmap;
824825

825826
platform_set_drvdata(pdev, is);
826827

@@ -880,6 +881,8 @@ static int fimc_is_probe(struct platform_device *pdev)
880881
free_irq(is->irq, is);
881882
err_clk:
882883
fimc_is_put_clocks(is);
884+
err_iounmap:
885+
iounmap(is->pmu_regs);
883886
return ret;
884887
}
885888

@@ -935,6 +938,7 @@ static int fimc_is_remove(struct platform_device *pdev)
935938
fimc_is_unregister_subdevs(is);
936939
vb2_dma_contig_cleanup_ctx(is->alloc_ctx);
937940
fimc_is_put_clocks(is);
941+
iounmap(is->pmu_regs);
938942
fimc_is_debugfs_remove(is);
939943
release_firmware(is->fw.f_w);
940944
fimc_is_free_cpu_memory(is);

0 commit comments

Comments
 (0)