diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-30 05:41:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-30 05:40:59 -0800 |
| commit | 0380dc86d2a75a4ae7d4246a94a5d767b0b75de4 (patch) | |
| tree | 42df33e187da62a0160d868913d4e52aa195a992 /drivers/video/fbdev/msm | |
| parent | 8b070723fe591937fd9b119ae2628df4aeabbb7d (diff) | |
| parent | 47d0c2b4a71dcbb37eb9557fdb1b041f3103bd09 (diff) | |
Merge "msm: mdss: Fix null pointer reference during debug init"
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 6 |
1 files 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; } |