summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/msm/mdss_debug.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_debug.c b/drivers/video/fbdev/msm/mdss_debug.c
index 8076ab2fc8e8..8eaeb33e2448 100644
--- a/drivers/video/fbdev/msm/mdss_debug.c
+++ b/drivers/video/fbdev/msm/mdss_debug.c
@@ -1244,10 +1244,13 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id,
if (ctl) {
mixer = mdss_mdp_mixer_get(ctl,
MDSS_MDP_MIXER_MUX_DEFAULT);
- ctrl_reg = mixer->base +
- MDSS_MDP_LAYER_MIXER_MISR_CTRL;
- value_reg = mixer->base +
+
+ if (mixer) {
+ ctrl_reg = mixer->base +
+ MDSS_MDP_LAYER_MIXER_MISR_CTRL;
+ value_reg = mixer->base +
MDSS_MDP_LAYER_MIXER_MISR_SIGNATURE;
+ }
}
} else {
if (block_id <= DISPLAY_MISR_HDMI) {