HID: magicmouse: scroll on entire surface, not just middle of mouse

Previously, scroll events only occurred when the user moved a touch
along the middle of the touch surface. This is unintuitive for a normal
user who is not aware of this. The device has a uniform surface, so the
distinction is artificial. This change removes the touch area check for
a scroll event, which replicates the OS X behavior.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index f10d56a15f2103699003e8cf13d2c07f0ac6e192..cd706354496ae3c599974528d503c9c6ceaabbaa 100644 (file)
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -160,10 +160,9 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
        msc->touches[id].size = misc & 63;
 
        /* If requested, emulate a scroll wheel by detecting small
-        * vertical touch motions along the middle of the mouse.
+        * vertical touch motions.
         */
-       if (emulate_scroll_wheel &&
-           middle_button_start < x && x < middle_button_stop) {
+       if (emulate_scroll_wheel) {
                static const int accel_profile[] = {
                        256, 228, 192, 160, 128, 96, 64, 32,
                };