---

yaml --- r: 189943 b: refs/heads/master c: 75f6653 h: refs/heads/master i: 189941: ca9af79 189939: fcc6d47 189935: a75656c v: v3
git-mirror · Apr 7, 2010 · 0b298fb · 0b298fb
1 parent 81f3dff
commit 0b298fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b408fe4f853dcfa18d133aa4cf1d7546b4c3870
+refs/heads/master: 75f66533bc883f761a7adcab3281fe3323efbc90
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -1304,6 +1304,8 @@ static int __init amd_iommu_init(void)
 	if (ret)
 		goto free;
 
+	enable_iommus();
+
 	if (iommu_pass_through)
 		ret = amd_iommu_init_passthrough();
 	else
@@ -1316,8 +1318,6 @@ static int __init amd_iommu_init(void)
 
 	amd_iommu_init_notifier();
 
-	enable_iommus();
-
 	if (iommu_pass_through)
 		goto out;
 
@@ -1331,6 +1331,7 @@ static int __init amd_iommu_init(void)
 	return ret;
 
 free:
+	disable_iommus();
 
 	amd_iommu_uninit_devices();