diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-10-31 00:03:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 02:37:30 +0100 |
| commit | 3d5640d1c7584689227256beeb63354c9a5baf2d (patch) | |
| tree | f39b91c70f9eba6bb64b55924be06662f3e11476 /drivers/char | |
| parent | [PATCH] hpet: fix uninitialized variable in hpet_register() (diff) | |
| download | linux-3d5640d1c7584689227256beeb63354c9a5baf2d.tar.xz linux-3d5640d1c7584689227256beeb63354c9a5baf2d.zip | |
[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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hpet.c | 4 |
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) } 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); } writeq(g, &timer->hpet_config); @@ -769,7 +769,7 @@ static unsigned long hpet_calibrate(struct hpets *hpetp) if (!timer) return 0; - hpet = hpets->hp_hpet; + hpet = hpetp->hp_hpet; t = read_counter(&timer->hpet_compare); i = 0; |