diff options
Diffstat (limited to 'drivers/char/hpet.c')
-rw-r--r-- | drivers/char/hpet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index a1eb14e6d9f7..bf2f5a51c687 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -49,7 +49,7 @@ | |||
49 | #define HPET_USER_FREQ (64) | 49 | #define HPET_USER_FREQ (64) |
50 | #define HPET_DRIFT (500) | 50 | #define HPET_DRIFT (500) |
51 | 51 | ||
52 | static u32 hpet_ntimer, hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; | 52 | static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; |
53 | 53 | ||
54 | /* A lock for concurrent access by app and isr hpet activity. */ | 54 | /* A lock for concurrent access by app and isr hpet activity. */ |
55 | static DEFINE_SPINLOCK(hpet_lock); | 55 | static DEFINE_SPINLOCK(hpet_lock); |
@@ -854,8 +854,7 @@ int hpet_alloc(struct hpet_data *hdp) | |||
854 | writeq(mcfg, &hpet->hpet_config); | 854 | writeq(mcfg, &hpet->hpet_config); |
855 | } | 855 | } |
856 | 856 | ||
857 | for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; | 857 | for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) { |
858 | i++, hpet_ntimer++, devp++) { | ||
859 | unsigned long v; | 858 | unsigned long v; |
860 | struct hpet_timer __iomem *timer; | 859 | struct hpet_timer __iomem *timer; |
861 | 860 | ||