Commit 9a87a532 authored Jul 14, 2022 by Sam Protsenko Committed by Greg Kroah-Hartman Aug 25, 2022

iommu/exynos: Handle failed IOMMU device registration properly



[ Upstream commit fce398d2d02c0a9a2bedf7c7201b123e153e8963 ]

If iommu_device_register() fails in exynos_sysmmu_probe(), the previous
calls have to be cleaned up. In this case, the iommu_device_sysfs_add()
should be cleaned up, by calling its remove counterpart call.

Fixes: d2c302b6 ("iommu/exynos: Make use of iommu_device_register interface")
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20220714165550.8884-3-semen.protsenko@linaro.org


Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 44913ccf

drivers/iommu/exynos-iommu.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -635,7 +635,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)

		ret = iommu_device_register(&data->iommu);
		if (ret)
		return ret;
		goto err_iommu_register;

		platform_set_drvdata(pdev, data);

		@@ -662,6 +662,10 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
		pm_runtime_enable(dev);

		return 0;

		err_iommu_register:
		iommu_device_sysfs_remove(&data->iommu);
		return ret;
		}

		static int __maybe_unused exynos_sysmmu_suspend(struct device *dev)