From 5541ba76dd2ff9df4ec63805eb97dcf1d7950f9d Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Mon, 8 Jun 2009 13:47:33 -0700 Subject: [PATCH] --- yaml --- r: 145941 b: refs/heads/master c: 71ff3bca2f70264effe8cbbdd5bc10cf6be5f2f0 h: refs/heads/master i: 145939: ebcd589a99067bd72db64a3d5171d1dd75a2585e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fec0fd91ffbc..add49ffb78e8 100644 --- 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 index 81872604eb76..772e91088e40 100644 --- 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);