Merge "iommu: arm-smmu: Fix a possible null pointer dereference" into msm-4.8

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2480,7 +2480,7 @@ static struct iommu_group arm_smmu_device_group(struct device dev)
		else
		group = generic_device_group(dev);

		if (IS_ERR(group))
		if (IS_ERR_OR_NULL(group))
		return group;

		if (dev_is_pci(dev))