Merge "drm/msm/dsi-staging: null pointer check at once after call dsi_panel_get" (48457358) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -3589,6 +3589,12 @@ static int dsi_display_res_init(struct dsi_display *display)
		display->parser_node,
		display->display_type,
		display->cmdline_topology);
		if (IS_ERR_OR_NULL(display->panel)) {
		rc = PTR_ERR(display->panel);
		pr_err("failed to get panel, rc=%d\n", rc);
		display->panel = NULL;
		goto error_ctrl_put;
		}

		display_for_each_ctrl(i, display) {
		struct msm_dsi_phy *phy = display->ctrl[i].phy;
		@@ -3597,13 +3603,6 @@ static int dsi_display_res_init(struct dsi_display *display)
		display->panel->host_config.force_hs_clk_lane;
		}

		if (IS_ERR_OR_NULL(display->panel)) {
		rc = PTR_ERR(display->panel);
		pr_err("failed to get panel, rc=%d\n", rc);
		display->panel = NULL;
		goto error_ctrl_put;
		}

		rc = dsi_display_parse_lane_map(display);
		if (rc) {
		pr_err("Lane map not found, rc=%d\n", rc);