1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 7ffc39965233..df01c691d130 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void)
         if (ret)
                 goto free;
 
+        ret = amd_iommu_init_devices();
+        if (ret)
+                goto free;
+
         if (iommu_pass_through)
                 ret = amd_iommu_init_passthrough();
         else
@@ -1296,6 +1300,9 @@ out:
         return ret;
 
 free:
+
+        amd_iommu_uninit_devices();
+
         free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
                    get_order(MAX_DOMAIN_ID/8));