]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.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)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 30 Sep 2010 22:57:35 +0000 (15:57 -0700)
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>
Cc: stable@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/hpet.c

index 410fdb3f1939ba98cfabea61071d0ffe403ef1a3..7494999141b3ae9c9ab67302481a2e6c15e969e6 100644 (file)
@@ -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;