---

yaml --- r: 204386 b: refs/heads/master c: 8d93efb h: refs/heads/master v: v3
git-mirror · Jun 24, 2010 · f9ad662 · f9ad662
1 parent 443d786
commit f9ad662
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 			}