diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-27 11:04:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-27 11:04:40 +0100 |
| commit | e0b5f80dd4226a920257c91a3b9070e81149060b (patch) | |
| tree | 34ceb6fbebb7ba3cda95dc6ca623084daf141b51 /arch/x86/kernel/amd_iommu_init.c | |
| parent | b7a0afb0b4649d9b43488d5f5b1660bc9cffcff6 (diff) | |
| parent | a02b11937a6e1079fdf386833129cd86a3576196 (diff) | |
| download | talos-op-linux-e0b5f80dd4226a920257c91a3b9070e81149060b.tar.gz talos-op-linux-e0b5f80dd4226a920257c91a3b9070e81149060b.zip | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 3 |
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(); |
