lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HID: magicmouse: properly account for scroll movement in state

Browse Source 
Before this change, sequential scroll events would take a variable
amount of movement due to incorrect accounting. This change ensures all
scroll movements require a deterministic touch movement for an action to
occur.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Chase Douglas
2010-06-20 21:32:29 -04:00
committed by Jiri Kosina
parent 9846f350ef
commit 8d93efb27a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hid/hid-magicmouse.c
View File

@@ -189,7 +189,8 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
case TOUCH_STATE_DRAG: case TOUCH_STATE_DRAG:
step = step / accel_profile[msc->scroll_accel]; step = step / accel_profile[msc->scroll_accel];
if (step != 0) { if (step != 0) {
msc->touches[id].scroll_y = y; msc->touches[id].scroll_y -=
step * accel_profile[msc->scroll_accel];
msc->scroll_jiffies = now; msc->scroll_jiffies = now;
input_report_rel(input, REL_WHEEL, step); input_report_rel(input, REL_WHEEL, step);
} }