summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDhaval Patel <pdhaval@codeaurora.org>2015-12-04 16:13:29 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:13:24 -0700
commit945d3d962ca4b188afb56a93e9fbec7f52f51002 (patch)
tree5d09c8b7c1daecff06b17e4f9f1eb98dd8be1f71
parented2fedf0a5d087656530676d63d8b3ba6deacbcd (diff)
msm: mdss: fix vbif debug bus dump in log
Invalid memory access during vbif debug bus dump in log leads to crash. This adds null check before accessing debug bus memory. Change-Id: I54b74ce1004c4246398f18cd1a262e29a0a20d20 Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_debug_xlog.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_debug_xlog.c b/drivers/video/fbdev/msm/mdss_debug_xlog.c
index f96ae8277b79..db0c1f2333ac 100644
--- a/drivers/video/fbdev/msm/mdss_debug_xlog.c
+++ b/drivers/video/fbdev/msm/mdss_debug_xlog.c
@@ -396,7 +396,8 @@ static void mdss_dump_vbif_debug_bus(u32 bus_dump_flag,
wmb();
__vbif_debug_bus(head, vbif_base, dump_addr, in_log);
- dump_addr += (head->block_cnt * head->test_pnt_cnt * 4);
+ if (dump_addr)
+ dump_addr += (head->block_cnt * head->test_pnt_cnt * 4);
}
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);