aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-magicmouse.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index cd706354496a..4c4a79c760a2 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -30,6 +30,10 @@ static bool emulate_scroll_wheel = true;
30module_param(emulate_scroll_wheel, bool, 0644); 30module_param(emulate_scroll_wheel, bool, 0644);
31MODULE_PARM_DESC(emulate_scroll_wheel, "Emulate a scroll wheel"); 31MODULE_PARM_DESC(emulate_scroll_wheel, "Emulate a scroll wheel");
32 32
33static bool scroll_acceleration = false;
34module_param(scroll_acceleration, bool, 0644);
35MODULE_PARM_DESC(scroll_acceleration, "Accelerate sequential scroll events");
36
33static bool report_touches = true; 37static bool report_touches = true;
34module_param(report_touches, bool, 0644); 38module_param(report_touches, bool, 0644);
35MODULE_PARM_DESC(report_touches, "Emit touch records (otherwise, only use them for emulation)"); 39MODULE_PARM_DESC(report_touches, "Emit touch records (otherwise, only use them for emulation)");
@@ -177,7 +181,9 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
177 switch (tdata[7] & TOUCH_STATE_MASK) { 181 switch (tdata[7] & TOUCH_STATE_MASK) {
178 case TOUCH_STATE_START: 182 case TOUCH_STATE_START:
179 msc->touches[id].scroll_y = y; 183 msc->touches[id].scroll_y = y;
180 msc->scroll_accel = min_t(int, msc->scroll_accel + 1, 184 if (scroll_acceleration)
185 msc->scroll_accel = min_t(int,
186 msc->scroll_accel + 1,
181 ARRAY_SIZE(accel_profile) - 1); 187 ARRAY_SIZE(accel_profile) - 1);
182 break; 188 break;
183 case TOUCH_STATE_DRAG: 189 case TOUCH_STATE_DRAG: