Merge "iommu/arm-smmu: check return value of register_smmu_master" into msm-4.8 (04e2c29e) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/iommu/arm-smmu.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -729,8 +729,14 @@ static int arm_smmu_parse_iommus_properties(struct arm_smmu_device *smmu,
		}

		list_for_each_entry_safe(entry, n, &iommus, list) {
		register_smmu_master(smmu, entry);
		int rc = register_smmu_master(smmu, entry);

		if (rc) {
		dev_err(smmu->dev, "Couldn't register %s\n",
		entry->node->name);
		} else {
		(*num_masters)++;
		}
		list_del(&entry->list);
		devm_kfree(smmu->dev, entry);
		}