diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 12:04:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 12:04:10 -0700 |
| commit | 5d7006369d3f512d9facf7fd64007812f05a4aa4 (patch) | |
| tree | 5310ee18f2688b71e1b572e19550f10527d94b7b | |
| parent | 5f8a0f6a477f1ae0d1e54bf84a720281996ac3e5 (diff) | |
| parent | ab8bdb44dab0f02b6e053abf34b325fa25576675 (diff) | |
Merge "msm: ipa: fix potential NULL deference on SMMU"
| -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; |