Merge tag 'drm-next-2022-03-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / mediatek / mtk_drm_drv.c

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 56ff8c5..838297f 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -236,6 +236,9 @@ static int mtk_drm_kms_init(struct drm_device *drm)
        struct device *dma_dev;
        int ret;
 
+       if (drm_firmware_drivers_only())
+               return -ENODEV;
+
        if (!iommu_present(&platform_bus_type))
                return -EPROBE_DEFER;
 
@@ -645,11 +648,8 @@ err_pm:
        pm_runtime_disable(dev);
 err_node:
        of_node_put(private->mutex_node);
-       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) {
+       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
                of_node_put(private->comp_node[i]);
-               if (private->ddp_comp[i].larb_dev)
-                       put_device(private->ddp_comp[i].larb_dev);
-       }
        return ret;
 }