diff options
| author | Will Deacon <will@kernel.org> | 2019-11-04 19:33:59 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-11-04 19:33:59 +0000 |
| commit | db22a9de7a785fd3e0e066b02c269d6bdf453aec (patch) | |
| tree | 9cdb0f3b94ecc882365eba42fbbfa4a6ddb1fd55 /drivers/iommu/arm-smmu.c | |
| parent | 759aaa10c76cbaaefc0670410fb2d54cf4ec10cc (diff) | |
| parent | 1be08f458d1602275b02f5357ef069957058f3fd (diff) | |
| download | linux-stable-db22a9de7a785fd3e0e066b02c269d6bdf453aec.tar.gz linux-stable-db22a9de7a785fd3e0e066b02c269d6bdf453aec.tar.bz2 linux-stable-db22a9de7a785fd3e0e066b02c269d6bdf453aec.zip | |
Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates
Merge in ARM SMMU fixes to avoid conflicts in the ARM io-pgtable code.
* for-joerg/arm-smmu/fixes:
iommu/io-pgtable-arm: Support all Mali configurations
iommu/io-pgtable-arm: Correct Mali attributes
iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index a2b1ca55b73e..a180665ea002 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -828,6 +828,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, return 0; out_clear_smmu: + __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); smmu_domain->smmu = NULL; out_unlock: mutex_unlock(&smmu_domain->init_mutex); |