]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
x86, hpet: Fix bogus error check in hpet_assign_irq()
authorThomas Gleixner <tglx@linutronix.de>
Tue, 28 Sep 2010 21:20:23 +0000 (23:20 +0200)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 6 Jan 2011 23:08:10 +0000 (18:08 -0500)
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: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/x86/kernel/hpet.c

index 5294b580d5dce2ba6e966c60ec01ca92a21ff2a6..c5f8121a0698a0dda4028088eaae481913529b22 100644 (file)
@@ -499,7 +499,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;