Merge tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-beck.git] / drivers / iommu / irq_remapping.c

diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 33c43952408067f604c5fa8a6b0d707086408095..74a1767c89b512fa09ef2698b918211451c8e8de 100644 (file)
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -12,6 +12,7 @@
 #include <asm/processor.h>
 #include <asm/x86_init.h>
 #include <asm/apic.h>
+#include <asm/hpet.h>
 
 #include "irq_remapping.h"
 
@@ -345,10 +346,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,
 
 int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
 {
-       if (!remap_ops || !remap_ops->setup_hpet_msi)
+       int ret;
+
+       if (!remap_ops || !remap_ops->alloc_hpet_msi)
                return -ENODEV;
 
-       return remap_ops->setup_hpet_msi(irq, id);
+       ret = remap_ops->alloc_hpet_msi(irq, id);
+       if (ret)
+               return -EINVAL;
+
+       return default_setup_hpet_msi(irq, id);
 }
 
 void panic_if_irq_remap(const char *msg)