From patchwork Mon Jun 21 01:32:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 107117 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5L1Wa9U003928 for ; Mon, 21 Jun 2010 01:32:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757368Ab0FUBch (ORCPT ); Sun, 20 Jun 2010 21:32:37 -0400 Received: from adelie.canonical.com ([91.189.90.139]:53164 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757231Ab0FUBcg (ORCPT ); Sun, 20 Jun 2010 21:32:36 -0400 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OQVsJ-000696-Q5; Mon, 21 Jun 2010 02:32:35 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OQVsJ-0001rP-Dd; Mon, 21 Jun 2010 02:32:35 +0100 From: Chase Douglas To: Jiri Kosina , Michael Poole Cc: linux-input@vger.kernel.org Subject: [PATCH 1/3] HID: magicmouse: properly account for scroll movement in state Date: Sun, 20 Jun 2010 21:32:29 -0400 Message-Id: <1277083951-29137-2-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1277083951-29137-1-git-send-email-chase.douglas@canonical.com> References: <1277083951-29137-1-git-send-email-chase.douglas@canonical.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 21 Jun 2010 01:32:37 +0000 (UTC) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 4c4a79c..f44aaf2 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/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); }