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

Commit ecfe33e0 authored by Yong Wu's avatar Yong Wu Committed by Greg Kroah-Hartman
Browse files

iommu/mediatek-v1: Add error handle for mtk_iommu_probe 



[ Upstream commit ac304c070c54413efabf29f9e73c54576d329774 ]

In the original code, we lack the error handle. This patch adds them.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Link: https://lore.kernel.org/r/20210412064843.11614-2-yong.wu@mediatek.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Stable-dep-of: 142e821f68cf ("iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec049ae2

drivers/iommu/mtk_iommu_v1.c

+18 −4
Original line number Diff line number Diff line
@@ -632,12 +632,26 @@ static int mtk_iommu_probe(struct platform_device *pdev) 


	ret = iommu_device_register(&data->iommu);

	if (ret)

		return ret;

		goto out_sysfs_remove;



	if (!iommu_present(&platform_bus_type))

		bus_set_iommu(&platform_bus_type,  &mtk_iommu_ops);

	if (!iommu_present(&platform_bus_type)) {

		ret = bus_set_iommu(&platform_bus_type,  &mtk_iommu_ops);

		if (ret)

			goto out_dev_unreg;

	}



	ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);

	if (ret)

		goto out_bus_set_null;

	return ret;



	return component_master_add_with_match(dev, &mtk_iommu_com_ops, match);

out_bus_set_null:

	bus_set_iommu(&platform_bus_type, NULL);

out_dev_unreg:

	iommu_device_unregister(&data->iommu);

out_sysfs_remove:

	iommu_device_sysfs_remove(&data->iommu);

	return ret;

}



static int mtk_iommu_remove(struct platform_device *pdev)