summaryrefslogtreecommitdiff
path: root/drivers/iommu/iommu.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/iommu/iommu.c')
-rw-r--r--drivers/iommu/iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f31ba66ccb2f..e0bfb114d08d 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2946,11 +2946,12 @@ static int iommu_change_dev_def_domain(struct iommu_group *group,
if (ret)
goto restore_old_domain;
- ret = iommu_group_create_direct_mappings(group);
+ group->domain = prev_dom;
+ ret = iommu_create_device_direct_mappings(group, dev);
if (ret)
goto free_new_domain;
- ret = __iommu_attach_group(group->default_domain, group);
+ ret = __iommu_group_set_domain(group, group->default_domain);
if (ret)
goto free_new_domain;
@@ -2962,7 +2963,6 @@ free_new_domain:
iommu_domain_free(group->default_domain);
restore_old_domain:
group->default_domain = prev_dom;
- group->domain = prev_dom;
return ret;
}