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

KAGA-KOKO · H. Peter Anvin · commit 021989622810 · 2010-09-30T15:57:35.000-07:00
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 &lt;tglx@linutronix.de&gt;
Cc: Venkatesh Pallipadi &lt;venki@google.com&gt;
LKML-Reference: &lt;alpine.LFD.2.00.1009282310360.2416@localhost6.localdomain6&gt;
Cc: stable@kernel.org
Signed-off-by: H. Peter Anvin &lt;hpa@linux.intel.com&gt;
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
@@ -506,7 +506,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;
 

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ static int hpet_assign_irq(struct hpet_dev *dev)`
`506`	`506`	`{`
`507`	`507`	`unsigned int irq;`
`508`	`508`
`509`		`- irq = create_irq();`
	`509`	`+ irq = create_irq_nr(0, -1);`
`510`	`510`	`if (!irq)`
`511`	`511`	`return -EINVAL;`
`512`	`512`