From f9ad6625dae70d41cadb1d9e48db8a3655e528d0 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Sun, 20 Jun 2010 21:32:29 -0400 Subject: [PATCH] --- yaml --- r: 204386 b: refs/heads/master c: 8d93efb27ab8927ffc7a357f1b2d10039de50ed4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-magicmouse.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8580c6fdc982..495268cd7cc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9846f350ef4d4108c1154acfc125fe8d8630ef84 +refs/heads/master: 8d93efb27ab8927ffc7a357f1b2d10039de50ed4 diff --git a/trunk/drivers/hid/hid-magicmouse.c b/trunk/drivers/hid/hid-magicmouse.c index 4c4a79c760a2..f44aaf21e1e2 100644 --- a/trunk/drivers/hid/hid-magicmouse.c +++ b/trunk/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); }