Merge "msm: mdss: only assign mfd pointer in blank event" (e7bac6b5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_status.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -65,6 +65,11 @@ static void check_dsi_ctrl_status(struct work_struct *work)
		return;
		}

		if (!pdsi_status->mfd) {
		pr_err("%s: FB data not available\n", __func__);
		return;
		}

		pdata = dev_get_platdata(&pdsi_status->mfd->pdev->dev);
		if (!pdata) {
		pr_err("%s: Panel data not available\n", __func__);
		@@ -149,12 +154,13 @@ static int fb_event_callback(struct notifier_block *self,
		unsigned long event, void *data)
		{
		struct fb_event *evdata = data;

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

		if (event == FB_EVENT_BLANK && evdata) {
		int *blank = evdata->data;
		switch (*blank) {
		case FB_BLANK_UNBLANK:
		schedule_delayed_work(&pdata->check_status,