diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-05 02:08:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-05 02:08:47 -0800 |
| commit | 9bcaa86e0cec25facfb36d8e913341df7b88c826 (patch) | |
| tree | f1a2e1424a95d57e751dc31f595ee734aa5cc501 | |
| parent | 7da94c32a47225b97381315a72a3a1b21e0a5f30 (diff) | |
| parent | 461809cfedcefca4c023f3e5939a1a4a5822141d (diff) | |
Merge "msm: mdss: Fix potential NULL pointer dereference in mdss smmu driver"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_smmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_smmu.h b/drivers/video/fbdev/msm/mdss_smmu.h index f7e6e275c16a..07b33a9432ae 100644 --- a/drivers/video/fbdev/msm/mdss_smmu.h +++ b/drivers/video/fbdev/msm/mdss_smmu.h @@ -247,7 +247,7 @@ static inline void mdss_smmu_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t phys, dma_addr_t iova, int domain) { struct mdss_data_type *mdata = mdss_mdp_get_mdata(); - if (mdata->smmu_ops.smmu_dma_free_coherent) + if (mdata && mdata->smmu_ops.smmu_dma_free_coherent) mdata->smmu_ops.smmu_dma_free_coherent(dev, size, cpu_addr, phys, iova, domain); } |