Merge "iommu/arm-smmu: avoid possible deadlock during map_sg" (7c46c88c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3046,12 +3046,12 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova,

		out:
		arm_smmu_assign_table(smmu_domain);
		arm_smmu_secure_domain_unlock(smmu_domain);

		if (size_to_unmap) {
		arm_smmu_unmap(domain, __saved_iova_start, size_to_unmap, NULL);
		iova = __saved_iova_start;
		}
		arm_smmu_secure_domain_unlock(smmu_domain);
		return iova - __saved_iova_start;
		}