From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 28 Sep 2010 21:20:23 +0000 (+0200)
Subject: x86, hpet: Fix bogus error check in hpet_assign_irq()
X-Git-Tag: firefly_0821_release~10186^2~838
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=47ec6adc95ec33a73d992bb7d24da0b48e42aba4;p=firefly-linux-kernel-4.4.55.git

x86, hpet: Fix bogus error check in hpet_assign_irq()

commit 021989622810b02aab4b24f91e1f5ada2b654579 upstream.

create_irq() returns -1 if the interrupt allocation failed, but the
code checks for irq == 0.

Use create_irq_nr() instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Venkatesh Pallipadi <venki@google.com>
LKML-Reference: <alpine.LFD.2.00.1009282310360.2416@localhost6.localdomain6>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 19528ef10d31..c771e1a37b9d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -497,7 +497,7 @@ static int hpet_assign_irq(struct hpet_dev *dev)
 {
 	unsigned int irq;
 
-	irq = create_irq();
+	irq = create_irq_nr(0, -1);
 	if (!irq)
 		return -EINVAL;