From 0b298fbe5203f989086f4bbb302f9780f1dd8749 Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 2 Apr 2010 18:27:52 -0700
Subject: [PATCH] --- yaml --- r: 189943 b: refs/heads/master c:
 75f66533bc883f761a7adcab3281fe3323efbc90 h: refs/heads/master i:   189941:
 ca9af79832be233571198c8dea4f9d973195f5ee   189939:
 fcc6d4755e756a9b9fdc4fb095abef641199ef6d   189935:
 a75656cf34b3030bd22568e8aeb73dc68ed6b31c v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/amd_iommu_init.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b01cc14bb19b..7419658425d4 100644
--- 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
index feaf47184900..8975965f3e67 100644
--- 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();