summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-11-02 14:00:29 +0000
committerThomas Gleixner <tglx@linutronix.de>2012-11-02 22:53:27 +0100
commit5074b85bdd3a464efe7b6de2ec163f4c07696a20 (patch)
tree8451161ef421c6017857eee38ed7a805fa83fa4e /arch/x86/kernel/apic
parent6acf5a8c931da9d26c8dd77d784daaf07fa2bff0 (diff)
downloadop-kernel-dev-5074b85bdd3a464efe7b6de2ec163f4c07696a20.zip
op-kernel-dev-5074b85bdd3a464efe7b6de2ec163f4c07696a20.tar.gz
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 1817fa9..b134f0b 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)
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);
OpenPOWER on IntegriCloud