Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 958ecaa4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: dsi: Fix null dereferences"

parents eecd9444 7c1e65af

drivers/video/msm/mdss/mdss_dsi_status.c

+6 −1
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ static int fb_event_callback(struct notifier_block *self, 
	struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;

	struct mdss_panel_info *pinfo;



	if (!evdata) {

		pr_err("%s: event data not available\n", __func__);

		return NOTIFY_BAD;

	}



	pdata->mfd = evdata->info->par;

	ctrl_pdata = container_of(dev_get_platdata(&pdata->mfd->pdev->dev),

				struct mdss_dsi_ctrl_pdata, panel_data);
@@ -103,7 +108,7 @@ static int fb_event_callback(struct notifier_block *self, 
		return NOTIFY_DONE;

	}



	if (event == FB_EVENT_BLANK && evdata) {

	if (event == FB_EVENT_BLANK) {

		int *blank = evdata->data;

		struct dsi_status_data *pdata = container_of(self,

				struct dsi_status_data, fb_notifier);

drivers/video/msm/mdss/msm_mdss_io_8974.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ int mdss_dsi_clk_ctrl(struct mdss_dsi_ctrl_pdata *ctrl, 
	 */

	if (link_changed && (!bus_changed && !ctrl->bus_clk_cnt)) {

		pr_err("%s: Trying to enable link clks w/o enabling bus clks for ctrl%d",

			__func__, mctrl->ndx);

			__func__, ctrl->ndx);

		goto error_mctrl_start;

	}