Re: [PATCH 2/4] HID: magicmouse: properly account for scroll movement in state

[Michael Poole <mdpoole@troilus.org>]

Chase Douglas writes:

> 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>

My apologies for the delay in reviewing this one.  I understand now, and
agree it's the right thing to do here.

Acked-by: Michael Poole <mdpoole@troilus.org>

(For the rest of the list, I acked the other three patches in this
series via private email earlier.)

Michael Poole

> ---
>  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 cd70635..171ed0c 100644
> --- a/drivers/hid/hid-magicmouse.c
> +++ b/drivers/hid/hid-magicmouse.c
> @@ -183,7 +183,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);
>  			}