diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2016-08-09 14:54:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:37:32 -0700 |
| commit | ab8bdb44dab0f02b6e053abf34b325fa25576675 (patch) | |
| tree | 69f898cfcbd8013cc7edea77a5b706c960498df3 /drivers/platform | |
| parent | c5984ec85c1e095f932f2fdaf5f327a2c1480c9b (diff) | |
msm: ipa: fix potential NULL deference on SMMU
Fix potential NULL deference when SMMU is available.
Change-Id: I3454612cb8473e94ceb8163eca018d2489bff0c5
CRs-Fixed: 1052523
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v2/ipa.c | 4 | ||||
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa.c b/drivers/platform/msm/ipa/ipa_v2/ipa.c index fc3d9f355da6..ff468ff67a97 100644 --- a/drivers/platform/msm/ipa/ipa_v2/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v2/ipa.c @@ -4440,7 +4440,7 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) cb->dev = dev; cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev), cb->va_start, cb->va_size); - if (IS_ERR(cb->mapping)) { + if (IS_ERR_OR_NULL(cb->mapping)) { IPADBG("Fail to create mapping\n"); /* assume this failure is because iommu driver is not ready */ return -EPROBE_DEFER; @@ -4543,7 +4543,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev), cb->va_start, cb->va_size); - if (IS_ERR(cb->mapping)) { + if (IS_ERR_OR_NULL(cb->mapping)) { IPADBG("Fail to create mapping\n"); /* assume this failure is because iommu driver is not ready */ return -EPROBE_DEFER; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c index 4db07bad7d93..cd6ed95209cf 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c @@ -4752,7 +4752,7 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) cb->dev = dev; cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev), cb->va_start, cb->va_size); - if (IS_ERR(cb->mapping)) { + if (IS_ERR_OR_NULL(cb->mapping)) { IPADBG("Fail to create mapping\n"); /* assume this failure is because iommu driver is not ready */ return -EPROBE_DEFER; @@ -4866,7 +4866,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) cb->dev = dev; cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev), cb->va_start, cb->va_size); - if (IS_ERR(cb->mapping)) { + if (IS_ERR_OR_NULL(cb->mapping)) { IPADBG("Fail to create mapping\n"); /* assume this failure is because iommu driver is not ready */ return -EPROBE_DEFER; |