diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c
index 00b94f2ac93b..2f72c52342a9 100644
--- a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c
+++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c
@@ -252,8 +252,10 @@ static int rk618_rgb_probe(struct platform_device *pdev)
 		}
 
 		rgb->panel = of_drm_find_panel(remote);
-		if (!rgb->panel)
+		if (IS_ERR(rgb->panel)) {
+			rgb->panel = NULL;
 			rgb->bridge = of_drm_find_bridge(remote);
+		}
 		of_node_put(remote);
 		if (!rgb->panel && !rgb->bridge) {
 			dev_err(dev, "Waiting for panel/bridge driver\n");