aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-11-02 10:00:29 -0400
committerThomas Gleixner <tglx@linutronix.de>2012-11-02 17:53:27 -0400
commit5074b85bdd3a464efe7b6de2ec163f4c07696a20 (patch)
tree8451161ef421c6017857eee38ed7a805fa83fa4e /arch/x86/kernel/apic
parent6acf5a8c931da9d26c8dd77d784daaf07fa2bff0 (diff)
x86: hpet: Fix inverted return value check in arch_setup_hpet_msi()
setup_hpet_msi_remapped() returns a negative error indicator on error - check for this rather than for a boolean false indication, and pass on that error code rather than a meaningless "-1". Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: David Woodhouse <dwmw2@infradead.org> Link: http://lkml.kernel.org/r/5093E00D02000078000A60E2@nat28.tlf.novell.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r--arch/x86/kernel/apic/io_apic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 1817fa911024..b134f0b7ed25 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3317,8 +3317,9 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)
3317 int ret; 3317 int ret;
3318 3318
3319 if (irq_remapping_enabled) { 3319 if (irq_remapping_enabled) {
3320 if (!setup_hpet_msi_remapped(irq, id)) 3320 ret = setup_hpet_msi_remapped(irq, id);
3321 return -1; 3321 if (ret)
3322 return ret;
3322 } 3323 }
3323 3324
3324 ret = msi_compose_msg(NULL, irq, &msg, id); 3325 ret = msi_compose_msg(NULL, irq, &msg, id);