diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2020-09-04 14:12:34 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2020-09-04 14:12:34 -0700 |
| commit | 547494bd1ad7d0f6d5e6faaf3b0abb8518410de3 (patch) | |
| tree | 39ee41bc7aa8b0a6d0045a7c26ca920de3e6405c | |
| parent | d995d7b54a27c1bafa30ec24ac40981211648027 (diff) | |
| parent | 5e9b16f5e9d71bcb831449fce8063e688e444bd9 (diff) | |
| download | display-drivers-android-msm-bramble-4.19-android11-qpr1.tar.gz | |
Merge android-msm-pixel-4.19-rvc into android-msm-pixel-4.19-rvc-qpr1android-11.0.0_r0.95android-11.0.0_r0.86android-11.0.0_r0.81android-11.0.0_r0.76android-11.0.0_r0.66android-11.0.0_r0.57android-11.0.0_r0.56android-11.0.0_r0.47android-11.0.0_r0.46android-11.0.0_r0.33android-11.0.0_r0.32android-11.0.0_r0.115android-11.0.0_r0.114android-11.0.0_r0.105android-11.0.0_r0.100android-msm-sunfish-4.14-android11-qpr3android-msm-redfin-4.19-android11-qpr1android-msm-redbull-4.19-android11-qpr3android-msm-redbull-4.19-android11-qpr2android-msm-bramble-4.19-android11-qpr1
SBMerger: 325904710
Change-Id: If9be716391a57916bcc29588788e7d859bd84c83
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | msm/dsi/dsi_panel_switch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/msm/dsi/dsi_panel_switch.c b/msm/dsi/dsi_panel_switch.c index 1362758c..17496b15 100644 --- a/msm/dsi/dsi_panel_switch.c +++ b/msm/dsi/dsi_panel_switch.c @@ -445,7 +445,7 @@ const struct dsi_display_mode *get_panel_display_mode(struct dsi_panel *panel) { 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) |