AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] hpet: fix access to multiple HPET devices

Browse Source 
Fix two instances where a function would access the first HPET device instead
of the current one.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: Bob Picco <bob.picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Clemens Ladisch 2005-10-30 15:03:39 -08:00 committed by Linus Torvalds
parent 7522e4ecdf
commit 3d5640d1c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/hpet.c
View File

@ -430,7 +430,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
} }
if (devp->hd_flags & HPET_SHARED_IRQ) { if (devp->hd_flags & HPET_SHARED_IRQ) {
isr = 1 << (devp - hpets->hp_dev); isr = 1 << (devp - devp->hd_hpets->hp_dev);
writel(isr, &hpet->hpet_isr); writel(isr, &hpet->hpet_isr);
} }
writeq(g, &timer->hpet_config); writeq(g, &timer->hpet_config);
@ -769,7 +769,7 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
if (!timer) if (!timer)
return 0; return 0;
hpet = hpets->hp_hpet; hpet = hpetp->hp_hpet;
t = read_counter(&timer->hpet_compare); t = read_counter(&timer->hpet_compare);
i = 0; i = 0;