| commit | 4d81cedaeb7d2da03d103129920c8fb9b380b286 | [log] [tgz] |
|---|---|---|
| author | Kyle Yan <kyan@quicinc.com> | Fri Nov 11 11:05:32 2016 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Nov 11 11:05:32 2016 -0800 |
| tree | d407af5d80711d4b895aae81b9230f530af23b29 | |
| parent | 6a6bdfec0437df0d38e37e275dac772969ca8719 [diff] | |
| parent | 26319445b615112ab5303f89b322c1a12583c121 [diff] |
Merge "iommu: arm-smmu: Fix a possible null pointer dereference" into msm-4.8
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index bc8e8e0..f4e6ee6 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c
@@ -2480,7 +2480,7 @@ else group = generic_device_group(dev); - if (IS_ERR(group)) + if (IS_ERR_OR_NULL(group)) return group; if (dev_is_pci(dev))