summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-11 03:18:13 +0100
committerTony Lindgren <tony@atomide.com>2010-02-11 03:18:13 +0100
commit0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch)
treea8506b9b15ed9a31c2171fc7b461ef52453307b0 /arch/x86/kernel/amd_iommu_init.c
parentMerge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap... (diff)
parentOMAP: hsmmc: fix memory leak (diff)
downloadlinux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.tar.xz
linux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.zip
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index fb490ce7dd55..9dc91b431470 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1292,9 +1292,12 @@ static int __init amd_iommu_init(void)
ret = amd_iommu_init_passthrough();
else
ret = amd_iommu_init_dma_ops();
+
if (ret)
goto free;
+ amd_iommu_init_api();
+
amd_iommu_init_notifier();
enable_iommus();