mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge "iommu/arm-smmu: avoid possible deadlock during map_sg"
This commit is contained in:
commit
7c46c88c7b
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue