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

Commit ad1267a0 authored by Arvind Yadav's avatar Arvind Yadav Committed by Greg Kroah-Hartman
Browse files

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: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bfcbe6cd

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

+6 −2
Original line number Diff line number Diff line
@@ -825,12 +825,13 @@ static int fimc_is_probe(struct platform_device *pdev) 
	is->irq = irq_of_parse_and_map(dev->of_node, 0);

	if (!is->irq) {

		dev_err(dev, "no irq found\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_iounmap;

	}



	ret = fimc_is_get_clocks(is);

	if (ret < 0)

		return ret;

		goto err_iounmap;



	platform_set_drvdata(pdev, is);
@@ -891,6 +892,8 @@ static int fimc_is_probe(struct platform_device *pdev) 
	free_irq(is->irq, is);

err_clk:

	fimc_is_put_clocks(is);

err_iounmap:

	iounmap(is->pmu_regs);

	return ret;

}
@@ -947,6 +950,7 @@ static int fimc_is_remove(struct platform_device *pdev) 
	fimc_is_unregister_subdevs(is);

	vb2_dma_contig_clear_max_seg_size(dev);

	fimc_is_put_clocks(is);

	iounmap(is->pmu_regs);

	fimc_is_debugfs_remove(is);

	release_firmware(is->fw.f_w);

	fimc_is_free_cpu_memory(is);