summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2010-06-20 21:32:29 -0400
committerJiri Kosina <jkosina@suse.cz>2010-06-24 10:48:03 +0200
commit8d93efb27ab8927ffc7a357f1b2d10039de50ed4 (patch)
tree1ffc1eaff7f116243d8a84ae6944b4fb985b8616 /drivers/hid
parent9846f350ef4d4108c1154acfc125fe8d8630ef84 (diff)
downloadlinux-8d93efb27ab8927ffc7a357f1b2d10039de50ed4.tar.gz
linux-8d93efb27ab8927ffc7a357f1b2d10039de50ed4.tar.bz2
linux-8d93efb27ab8927ffc7a357f1b2d10039de50ed4.zip
HID: magicmouse: properly account for scroll movement in state
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-magicmouse.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 4c4a79c760a2..f44aaf21e1e2 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -189,7 +189,8 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
case TOUCH_STATE_DRAG:
step = step / accel_profile[msc->scroll_accel];
if (step != 0) {
- msc->touches[id].scroll_y = y;
+ msc->touches[id].scroll_y -=
+ step * accel_profile[msc->scroll_accel];
msc->scroll_jiffies = now;
input_report_rel(input, REL_WHEEL, step);
}