diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2010-06-24 11:37:28 -0400 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-07-13 11:28:44 -0700 |
| commit | f0181df376a269ad70c8523174d01395f31b35eb (patch) | |
| tree | 5b8cc5d9bc64baa9fb3b6a2706367519d6ae3b17 | |
| parent | c7784d03f4bd530e8fb42c3223e95f17370999fc (diff) | |
UBUNTU: [Upstream] 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>
(cherry picked from commit 8d93efb27ab8927ffc7a357f1b2d10039de50ed4
from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
Acked-by: Steve Conklin <steve.conklin@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 4c4a79c760a..f44aaf21e1e 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); } |