aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/hpet.c
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@gmail.com>2008-01-30 07:30:03 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:03 -0500
commit37a47db8d7f0f38dac5acf5a13abbc8f401707fa (patch)
treef3827e6b77a81680b2870f82a22bb86c4fefefee /drivers/char/hpet.c
parente3f37a54f690d3e64995ea7ecea08c5ab3070faf (diff)
x86: assign IRQs to HPET timers, fix
Looks like IRQ 31 is assigned to timer 3, even without the patch! I wonder who wrote the number 31. But the manual says that it is zero by default. I think we should check whether the timer has been allocated an IRQ before proceeding to assign one to it. Here is a patch that does this. Signed-off-by: Balaji Rao <balajirrao@gmail.com> Tested-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/char/hpet.c')
-rw-r--r--drivers/char/hpet.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 593b32cfbc33..22f5fd02ea87 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -852,6 +852,12 @@ int hpet_alloc(struct hpet_data *hdp)
852 852
853 timer = &hpet->hpet_timers[devp - hpetp->hp_dev]; 853 timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
854 854
855 /* Check if there's already an IRQ assigned to the timer */
856 if (hdp->hd_irq[i]) {
857 hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i];
858 continue;
859 }
860
855 hpet_config = readq(&timer->hpet_config); 861 hpet_config = readq(&timer->hpet_config);
856 irq_bitmap = (hpet_config & Tn_INT_ROUTE_CAP_MASK) 862 irq_bitmap = (hpet_config & Tn_INT_ROUTE_CAP_MASK)
857 >> Tn_INT_ROUTE_CAP_SHIFT; 863 >> Tn_INT_ROUTE_CAP_SHIFT;