From a3632c48cd2b4819718db7c02349eab08738c80e Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Sun, 30 Oct 2005 15:03:31 -0800 Subject: [PATCH] --- yaml --- r: 11900 b: refs/heads/master c: 642d30bbc73512269de1524251ccc378d7782b85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hpet.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1cbe2016f8a5..2d37d8f3d164 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba3f213f8a31af953b7e86b1d102c919e9935cd4 +refs/heads/master: 642d30bbc73512269de1524251ccc378d7782b85 diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c index a1eb14e6d9f7..bf2f5a51c687 100644 --- a/trunk/drivers/char/hpet.c +++ b/trunk/drivers/char/hpet.c @@ -49,7 +49,7 @@ #define HPET_USER_FREQ (64) #define HPET_DRIFT (500) -static u32 hpet_ntimer, hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; +static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; /* A lock for concurrent access by app and isr hpet activity. */ static DEFINE_SPINLOCK(hpet_lock); @@ -854,8 +854,7 @@ int hpet_alloc(struct hpet_data *hdp) writeq(mcfg, &hpet->hpet_config); } - for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; - i++, hpet_ntimer++, devp++) { + for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) { unsigned long v; struct hpet_timer __iomem *timer;