From: Arvind Yadav Date: Thu, 22 Jun 2017 07:27:42 +0000 (+0530) Subject: iommu: arm-smmu: Handle return of iommu_device_register. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c2d0218290afa3c335f38583bf4f8e8adad4c76;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git iommu: arm-smmu: Handle return of iommu_device_register. iommu_device_register returns an error code and, although it currently never fails, we should check its return value anyway. Signed-off-by: Arvind Yadav [will: adjusted to follow arm-smmu.c] Signed-off-by: Will Deacon --- diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 0fd09745822f..029fe0cffee7 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2744,6 +2744,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev) iommu_device_set_fwnode(&smmu->iommu, dev->fwnode); ret = iommu_device_register(&smmu->iommu); + if (ret) { + dev_err(dev, "Failed to register iommu\n"); + return ret; + } #ifdef CONFIG_PCI if (pci_bus_type.iommu_ops != &arm_smmu_ops) {