diff options
| author | Ping Li <pingli@codeaurora.org> | 2016-04-15 15:27:36 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-11 17:43:50 -0700 |
| commit | 59775321c6a786ff99a80c5127220422d8bf5587 (patch) | |
| tree | d07c3fea18e823b163c6406c66f4f52283190f51 /drivers/video/fbdev | |
| parent | b7d244ed563b401c228cffb03450ebf0793563a1 (diff) | |
msm: mdss: Correct block id check for mdss_mdp_misr_table
DISPLAY_MISR_LCDC block doesn't have corresponding mdss_mdp_misr_table,
this change corrects the block id check for mdss_mdp_misr_table.
CRs-Fixed: 1001224
Change-Id: I74b03c31542d4b239eb2ffdc4dc6345dff5eab86
Signed-off-by: Ping Li <pingli@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_debug.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_debug.c b/drivers/video/fbdev/msm/mdss_debug.c index 08d57e9de244..d1a516637506 100644 --- a/drivers/video/fbdev/msm/mdss_debug.c +++ b/drivers/video/fbdev/msm/mdss_debug.c @@ -1266,7 +1266,7 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id, char *ctrl_reg = NULL, *value_reg = NULL; char *intf_base = NULL; - if (block_id > DISPLAY_MISR_MDP) { + if (block_id > DISPLAY_MISR_HDMI && block_id != DISPLAY_MISR_MDP) { pr_err("MISR Block id (%d) out of range\n", block_id); return NULL; } @@ -1408,12 +1408,16 @@ int mdss_misr_set(struct mdss_data_type *mdata, bool is_valid_wb_mixer = true; bool use_mdp_up_misr = false; + if (!mdata || !req || !ctl) { + pr_err("Invalid input params: mdata = %p req = %p ctl = %p", + mdata, req, ctl); + return -EINVAL; + } pr_debug("req[block:%d frame:%d op_mode:%d]\n", req->block_id, req->frame_count, req->crc_op_mode); map = mdss_misr_get_map(req->block_id, ctl, mdata, ctl->is_video_mode); - if (!map) { pr_err("Invalid MISR Block=%d\n", req->block_id); return -EINVAL; |