Merge "drm/msm/dsi-staging: add NULL check before pointer dereference" (3b897da2) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -2452,6 +2452,9 @@ static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode,
		u32 refresh_rate = TICKS_IN_MICRO_SECOND;
		struct dsi_mode_info *timing = NULL;

		if (!mode \|\| !mode->priv_info)
		return -EINVAL;

		priv_info = mode->priv_info;

		data = utils->get_property(utils->data,
		@@ -2471,10 +2474,6 @@ static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode,
		};

		timing = &mode->timing;
		if (!timing) {
		pr_err("timing is null\n");
		return -EINVAL;
		}

		if (panel_mode == DSI_OP_CMD_MODE) {
		h_period = DSI_H_ACTIVE_DSC(timing);