Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / x86 / kernel / apic / io_apic.c

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 70aa621df118d69d08e3b4654678318c58c6dbf2..b739d398bb29bc6951e777827cd56c982cedb452 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3305,8 +3305,9 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)
        int ret;
 
        if (irq_remapping_enabled) {
-               if (!setup_hpet_msi_remapped(irq, id))
-                       return -1;
+               ret = setup_hpet_msi_remapped(irq, id);
+               if (ret)
+                       return ret;
        }
 
        ret = msi_compose_msg(NULL, irq, &msg, id);