diff options
author | Marko Macek <Marko.Macek@gmx.net> | 2006-07-30 04:55:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-02 19:41:42 -0400 |
commit | 168ffc444663e34a20e6d04b6c31e5d495b283fb (patch) | |
tree | 9339796ee1c75c265d6011002eef58d4424da04a /drivers/usb | |
parent | 064e875a4cb1dad7b3a00661877fe8cd95d1a59a (diff) |
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/input/ati_remote.c | 5 |
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 }; | |||
152 | * events. The hardware generates 5 events for the first keypress | 152 | * events. The hardware generates 5 events for the first keypress |
153 | * and we have to take this into account for an accurate repeat | 153 | * and we have to take this into account for an accurate repeat |
154 | * behaviour. | 154 | * behaviour. |
155 | * (HZ / 20) == 50 ms and works well for me. | ||
156 | */ | 155 | */ |
157 | #define FILTER_TIME (HZ / 20) | 156 | #define FILTER_TIME 60 /* msec */ |
158 | 157 | ||
159 | struct ati_remote { | 158 | struct ati_remote { |
160 | struct input_dev *idev; | 159 | struct input_dev *idev; |
@@ -467,7 +466,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | |||
467 | /* Filter duplicate events which happen "too close" together. */ | 466 | /* Filter duplicate events which happen "too close" together. */ |
468 | if ((ati_remote->old_data[0] == data[1]) && | 467 | if ((ati_remote->old_data[0] == data[1]) && |
469 | (ati_remote->old_data[1] == data[2]) && | 468 | (ati_remote->old_data[1] == data[2]) && |
470 | time_before(jiffies, ati_remote->old_jiffies + FILTER_TIME)) { | 469 | time_before(jiffies, ati_remote->old_jiffies + msecs_to_jiffies(FILTER_TIME))) { |
471 | ati_remote->repeat_count++; | 470 | ati_remote->repeat_count++; |
472 | } else { | 471 | } else { |
473 | ati_remote->repeat_count = 0; | 472 | ati_remote->repeat_count = 0; |