From cf105aa4151a4782d77061c7d5e94172a4bc4f3a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 2 Nov 2012 14:00:29 +0000 Subject: [PATCH] --- yaml --- r: 339157 b: refs/heads/master c: 5074b85bdd3a464efe7b6de2ec163f4c07696a20 h: refs/heads/master i: 339155: 95bf28f1f53ae7898f22bb803474fa8478964579 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/io_apic.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca6373358882..b85a76c96e0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6acf5a8c931da9d26c8dd77d784daaf07fa2bff0 +refs/heads/master: 5074b85bdd3a464efe7b6de2ec163f4c07696a20 diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c index 1817fa911024..b134f0b7ed25 100644 --- a/trunk/arch/x86/kernel/apic/io_apic.c +++ b/trunk/arch/x86/kernel/apic/io_apic.c @@ -3317,8 +3317,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);