diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 62669088cc..7055cca7f5 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -1839,8 +1839,9 @@ static int add_components_mdp(struct device *mdp_dev,
 		if (!intf)
 			continue;
 
-		drm_of_component_match_add(master_dev, matchptr, compare_of,
-					   intf);
+		if (of_device_is_available(intf))
+			drm_of_component_match_add(master_dev, matchptr,
+						   compare_of, intf);
 		of_node_put(intf);
 	}