aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-28 23:20:23 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2010-09-30 15:57:35 -0700
commit021989622810b02aab4b24f91e1f5ada2b654579 (patch)
treeb82183d2b69b8510122872206ffa7d75d5542131 /arch
parent1cf180c94e9166cda083ff65333883ab3648e852 (diff)
downloadmrst-s0i3-test-021989622810b02aab4b24f91e1f5ada2b654579.tar.gz
mrst-s0i3-test-021989622810b02aab4b24f91e1f5ada2b654579.tar.xz
mrst-s0i3-test-021989622810b02aab4b24f91e1f5ada2b654579.zip
x86, hpet: Fix bogus error check in hpet_assign_irq()
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/hpet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 410fdb3f193..7494999141b 100644
--- 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;