From ff260eb48df53211ab87d4be460be0ba35264d08 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Sun, 30 Oct 2005 15:03:40 -0800 Subject: [PATCH] --- yaml --- r: 11911 b: refs/heads/master c: c860ed9fb5d320407f99190ab2e31bfe74db6724 h: refs/heads/master i: 11909: c7d22774d97a7855ffc3e60e0e13e5bd340a1e82 11907: 8b9114dca5a7b4b3ae892e6964def978d21d08b9 11903: 06145c45d7c79b441e123bb795e8fb33c477f3f9 v: v3 --- [refs] | 2 +- trunk/drivers/char/hpet.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a363719721b1..f4a8a29578f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d5640d1c7584689227256beeb63354c9a5baf2d +refs/heads/master: c860ed9fb5d320407f99190ab2e31bfe74db6724 diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c index cdf2ec842e2c..cf325622b396 100644 --- a/trunk/drivers/char/hpet.c +++ b/trunk/drivers/char/hpet.c @@ -501,8 +501,8 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel) info.hi_ireqfreq = 0; info.hi_flags = readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; - info.hi_hpet = devp->hd_hpets->hp_which; - info.hi_timer = devp - devp->hd_hpets->hp_dev; + info.hi_hpet = hpetp->hp_which; + info.hi_timer = devp - hpetp->hp_dev; if (kernel) memcpy((void *)arg, &info, sizeof(info)); else