diff options
| author | Archit Taneja <architt@codeaurora.org> | 2016-05-18 10:29:25 +0530 |
|---|---|---|
| committer | Archit Taneja <architt@codeaurora.org> | 2016-05-18 12:32:14 +0530 |
| commit | d9baad239ebde820c15a3b23f36045cf3f161486 (patch) | |
| tree | 67e1342e4fa7d5f59100d2be39a1c3c41a1d3c4e | |
| parent | 5dd8a1801113df939d1aa49e954559f76591665d (diff) | |
arm smmu merge fix
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index f260fa032fe40..cabb30e7dedad 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1065,10 +1065,6 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, int i, ret; void __iomem *gr0_base = ARM_SMMU_GR0(cfg->smmu); - ret = arm_smmu_master_configure_smrs(cfg); - if (ret) - return ret; - /* * FIXME: This won't be needed once we have IOMMU-backed DMA ops * for all devices behind the SMMU. Note that we need to take @@ -1079,7 +1075,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, return 0; /* Devices in an IOMMU group may already be configured */ - ret = arm_smmu_master_configure_smrs(smmu, cfg); + ret = arm_smmu_master_configure_smrs(cfg); if (ret) return ret == -EEXIST ? 0 : ret; |