iommu/mediatek-v1: Add error handle for mtk_iommu_probe

[ Upstream commit 3c0c466f63dc0daaa115c7552d857e3a0f49a647 ]

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

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Link: https://lore.kernel.org/r/20210412064843.11614-2-yong.wu@mediatek.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Stable-dep-of: 142e821f68cf ("iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index b5efd6dac953999a8780f19a9836a7353acd6b0f..7b1833b0f059a15d7681614ca2b46b98bd514774 100644 (file)
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -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;
+       }
 
-       return component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+       ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+       if (ret)
+               goto out_bus_set_null;
+       return ret;
+
+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)