aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-10-30 18:03:39 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 20:37:30 -0500
commit3d5640d1c7584689227256beeb63354c9a5baf2d (patch)
treef39b91c70f9eba6bb64b55924be06662f3e11476
parent7522e4ecdfdf86b9816f06d55766a6f88baa0348 (diff)
[PATCH] hpet: fix access to multiple HPET devices
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>
-rw-r--r--drivers/char/hpet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 73e6614cdf84..cdf2ec842e2c 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -430,7 +430,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
430 } 430 }
431 431
432 if (devp->hd_flags & HPET_SHARED_IRQ) { 432 if (devp->hd_flags & HPET_SHARED_IRQ) {
433 isr = 1 << (devp - hpets->hp_dev); 433 isr = 1 << (devp - devp->hd_hpets->hp_dev);
434 writel(isr, &hpet->hpet_isr); 434 writel(isr, &hpet->hpet_isr);
435 } 435 }
436 writeq(g, &timer->hpet_config); 436 writeq(g, &timer->hpet_config);
@@ -769,7 +769,7 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
769 if (!timer) 769 if (!timer)
770 return 0; 770 return 0;
771 771
772 hpet = hpets->hp_hpet; 772 hpet = hpetp->hp_hpet;
773 t = read_counter(&timer->hpet_compare); 773 t = read_counter(&timer->hpet_compare);
774 774
775 i = 0; 775 i = 0;