---

yaml --- r: 145941 b: refs/heads/master c: 71ff3bc h: refs/heads/master i: 145939: ebcd589 v: v3
git-mirror · Jun 9, 2009 · 5541ba7 · 5541ba7
1 parent 2449af1
commit 5541ba7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29150078d7a1758df8c7a6cd2ec066ac65e1fab9
+refs/heads/master: 71ff3bca2f70264effe8cbbdd5bc10cf6be5f2f0
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
@@ -2073,7 +2073,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,
 
 	old_domain = domain_for_device(devid);
 	if (old_domain)
-		return -EBUSY;
+		detach_device(old_domain, devid);
 
 	attach_device(iommu, domain, devid);