diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-22 00:02:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-22 00:02:23 -0700 |
| commit | 3320f03611573a955335d21df736b48412c8f902 (patch) | |
| tree | 9a3891cf8f501097180b1ef612ceb7ff05db5656 /drivers/iommu | |
| parent | a07e2a0fb69594bcbb87b4eef49a801cc362bf50 (diff) | |
| parent | 98de7b7b6684639a4af13718e4159428987ecf33 (diff) | |
Merge "iommu: arm-smmu: Fix a possible null pointer dereference"
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index afa519aa8203..702706ae60f7 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2938,7 +2938,7 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) */ group = generic_device_group(dev); - if (IS_ERR(group)) + if (IS_ERR_OR_NULL(group)) return group; if (dev_is_pci(dev)) |