summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Macek <Marko.Macek@gmx.net>2006-07-30 01:55:12 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-02 16:41:42 -0700
commit168ffc444663e34a20e6d04b6c31e5d495b283fb (patch)
tree9339796ee1c75c265d6011002eef58d4424da04a
parent064e875a4cb1dad7b3a00661877fe8cd95d1a59a (diff)
downloadlinux-stable-168ffc444663e34a20e6d04b6c31e5d495b283fb.tar.gz
linux-stable-168ffc444663e34a20e6d04b6c31e5d495b283fb.tar.bz2
linux-stable-168ffc444663e34a20e6d04b6c31e5d495b283fb.zip
USB: ati_remote.c: autorepeat fix
When HZ is set to 250 (new default) or 100, the time span during which repeated events from the device are ignored could be too small due to ms->jiffies rounding. This causes the auto repeat to kick in early making it impossible for the user to generate individual press/release events. Increate the timeout to compensate. Signed-off-by: Marko Macek <Marko.Macek@gmx.net> Cc: Dmitry Torokhov <dtor_core@ameritech.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/input/ati_remote.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 05d2d6012eb2..df198cf76f52 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -152,9 +152,8 @@ static const char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
* events. The hardware generates 5 events for the first keypress
* and we have to take this into account for an accurate repeat
* behaviour.
- * (HZ / 20) == 50 ms and works well for me.
*/
-#define FILTER_TIME (HZ / 20)
+#define FILTER_TIME 60 /* msec */
struct ati_remote {
struct input_dev *idev;
@@ -467,7 +466,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
/* Filter duplicate events which happen "too close" together. */
if ((ati_remote->old_data[0] == data[1]) &&
(ati_remote->old_data[1] == data[2]) &&
- time_before(jiffies, ati_remote->old_jiffies + FILTER_TIME)) {
+ time_before(jiffies, ati_remote->old_jiffies + msecs_to_jiffies(FILTER_TIME))) {
ati_remote->repeat_count++;
} else {
ati_remote->repeat_count = 0;