In order to simplify the error patch(avoid call of_node_put), Use
component_match_add instead component_match_add_release since we are only
interested in the "device" here. Then we could always call of_node_put in
normal path.

Strictly this is not a fixes patch, but it is a prepare for adding the
error path, thus I add a Fixes tag too.

Fixes: d2e9a1102cfc ("iommu/mediatek: Contain MM IOMMU flow with the MM TYPE")
Suggested-by: Robin Murphy <robin.mur...@arm.com>
Signed-off-by: Yong Wu <yong...@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 151ab46d4eac..3da8c6252c2c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1070,19 +1070,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, 
struct component_match **m
                        id = i;
 
                plarbdev = of_find_device_by_node(larbnode);
-               if (!plarbdev) {
-                       of_node_put(larbnode);
+               of_node_put(larbnode);
+               if (!plarbdev)
                        return -ENODEV;
-               }
+
                if (!plarbdev->dev.driver) {
-                       of_node_put(larbnode);
                        platform_device_put(plarbdev);
                        return -EPROBE_DEFER;
                }
                data->larb_imu[id].dev = &plarbdev->dev;
 
-               component_match_add_release(dev, match, component_release_of,
-                                           component_compare_of, larbnode);
+               component_match_add(dev, match, component_compare_dev, 
&plarbdev->dev);
                platform_device_put(plarbdev);
        }
 
-- 
2.18.0

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to