Merge "msm: mdss: check for validity of ESD thread before scheduling it" (a2f51fc6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_status.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -87,14 +87,15 @@ static int fb_event_callback(struct notifier_block *self,
		struct dsi_status_data, fb_notifier);
		struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;
		struct mdss_panel_info *pinfo;
		struct msm_fb_data_type *mfd;

		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),
		mfd = evdata->info->par;
		ctrl_pdata = container_of(dev_get_platdata(&mfd->pdev->dev),
		struct mdss_dsi_ctrl_pdata, panel_data);
		if (!ctrl_pdata) {
		pr_err("%s: DSI ctrl not available\n", __func__);
		@@ -113,6 +114,7 @@ static int fb_event_callback(struct notifier_block *self,
		return NOTIFY_DONE;
		}

		pdata->mfd = evdata->info->par;
		if (event == FB_EVENT_BLANK) {
		int *blank = evdata->data;
		struct dsi_status_data *pdata = container_of(self,