Patch "media: iommu/mediatek: Return ENODEV if the device is NULL" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    media: iommu/mediatek: Return ENODEV if the device is NULL

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     media-iommu-mediatek-return-enodev-if-the-device-is-.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit ccbeb2ea5d146993e6b5475574b887c8b248513f
Author: Yong Wu <yong.wu@xxxxxxxxxxxx>
Date:   Mon Jan 17 08:05:00 2022 +0100

    media: iommu/mediatek: Return ENODEV if the device is NULL
    
    [ Upstream commit 2fb0feed51085db77606de9b9477c96894328809 ]
    
    The platform device is created at:
    of_platform_default_populate_init:  arch_initcall_sync
      ->of_platform_populate
            ->of_platform_device_create_pdata
    
    When entering our probe, all the devices should be already created.
    if it is null, means NODEV. Currently we don't get the fail case.
    It's a minor fix, no need add fixes tags.
    
    Signed-off-by: Yong Wu <yong.wu@xxxxxxxxxxxx>
    Acked-by: Joerg Roedel <jroedel@xxxxxxx>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 25b834104790..77ae20ff9b35 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -848,7 +848,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 		plarbdev = of_find_device_by_node(larbnode);
 		if (!plarbdev) {
 			of_node_put(larbnode);
-			return -EPROBE_DEFER;
+			return -ENODEV;
 		}
 		data->larb_imu[id].dev = &plarbdev->dev;
 
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 1467ba1e4417..68bf02f87cfd 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -604,7 +604,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 		plarbdev = of_find_device_by_node(larbnode);
 		if (!plarbdev) {
 			of_node_put(larbnode);
-			return -EPROBE_DEFER;
+			return -ENODEV;
 		}
 		data->larb_imu[i].dev = &plarbdev->dev;