diff options
Diffstat (limited to 'drivers/iommu/irq_remapping.c')
-rw-r--r-- | drivers/iommu/irq_remapping.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c index 33c439524080..74a1767c89b5 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
13 | #include <asm/x86_init.h> | 13 | #include <asm/x86_init.h> |
14 | #include <asm/apic.h> | 14 | #include <asm/apic.h> |
15 | #include <asm/hpet.h> | ||
15 | 16 | ||
16 | #include "irq_remapping.h" | 17 | #include "irq_remapping.h" |
17 | 18 | ||
@@ -345,10 +346,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq, | |||
345 | 346 | ||
346 | int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) | 347 | int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) |
347 | { | 348 | { |
348 | if (!remap_ops || !remap_ops->setup_hpet_msi) | 349 | int ret; |
350 | |||
351 | if (!remap_ops || !remap_ops->alloc_hpet_msi) | ||
349 | return -ENODEV; | 352 | return -ENODEV; |
350 | 353 | ||
351 | return remap_ops->setup_hpet_msi(irq, id); | 354 | ret = remap_ops->alloc_hpet_msi(irq, id); |
355 | if (ret) | ||
356 | return -EINVAL; | ||
357 | |||
358 | return default_setup_hpet_msi(irq, id); | ||
352 | } | 359 | } |
353 | 360 | ||
354 | void panic_if_irq_remap(const char *msg) | 361 | void panic_if_irq_remap(const char *msg) |