Merge "mdss: dsi: Fix null dereferences"
diff --git a/drivers/video/msm/mdss/mdss_dsi_status.c b/drivers/video/msm/mdss/mdss_dsi_status.c
index 02540bb..f0fe7c0 100644
--- a/drivers/video/msm/mdss/mdss_dsi_status.c
+++ b/drivers/video/msm/mdss/mdss_dsi_status.c
@@ -83,6 +83,11 @@
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 @@
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);