Merge android-msm-pixel-4.19-rvc into android-msm-pixel-4.19-rvc-qpr1
SBMerger: 325904710
Change-Id: If9be716391a57916bcc29588788e7d859bd84c83
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/msm/dsi/dsi_panel_switch.c b/msm/dsi/dsi_panel_switch.c
index 1362758..17496b1 100644
--- a/msm/dsi/dsi_panel_switch.c
+++ b/msm/dsi/dsi_panel_switch.c
@@ -445,7 +445,7 @@
{
struct panel_switch_data *pdata = panel->private_data;
- return unlikely(!pdata) ? NULL : pdata->display_mode;
+ return !pdata ? panel->cur_mode : pdata->display_mode;
}
static int panel_idle(struct dsi_panel *panel)
