From 47d0c2b4a71dcbb37eb9557fdb1b041f3103bd09 Mon Sep 17 00:00:00 2001 From: Jayant Shekhar Date: Tue, 12 Jul 2016 11:31:59 +0530 Subject: [PATCH] msm: mdss: Fix null pointer reference during debug init Some targets doesn't seem to have vbif_nrt_phys in dtsi file but we still register the debug node for vbif_nrt_reg and off without checking whether it exists or not. Ensure this is checked to avoid null pointer reference. Change-Id: Icce8823f80e586bc4827d8db18dceb2fb866c2f9 Signed-off-by: Jayant Shekhar --- drivers/video/fbdev/msm/mdss_mdp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index 3dfcbfb291ef..e137a8b050b0 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -1816,8 +1816,10 @@ static int mdss_mdp_debug_init(struct platform_device *pdev, mdss_debug_register_dump_range(pdev, dbg_blk, "qcom,regs-dump-mdp", "qcom,regs-dump-names-mdp", "qcom,regs-dump-xin-id-mdp"); - mdss_debug_register_io("vbif", &mdata->vbif_io, NULL); - mdss_debug_register_io("vbif_nrt", &mdata->vbif_nrt_io, NULL); + if (mdata->vbif_io.base) + mdss_debug_register_io("vbif", &mdata->vbif_io, NULL); + if (mdata->vbif_nrt_io.base) + mdss_debug_register_io("vbif_nrt", &mdata->vbif_nrt_io, NULL); return 0; }