From patchwork Thu Sep 23 12:15:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Poole X-Patchwork-Id: 201802 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8NCFsO6001028 for ; Thu, 23 Sep 2010 12:15:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107Ab0IWMPr (ORCPT ); Thu, 23 Sep 2010 08:15:47 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:41332 "HELO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752394Ab0IWMPr (ORCPT ); Thu, 23 Sep 2010 08:15:47 -0400 Received: from source ([209.85.216.49]) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKTJtE70dpXGI0S7M1tGbYQU/ljxxJs1qj@postini.com; Thu, 23 Sep 2010 05:15:46 PDT Received: by mail-qw0-f49.google.com with SMTP id 4so19001qwe.36 for ; Thu, 23 Sep 2010 05:15:43 -0700 (PDT) Received: by 10.229.99.131 with SMTP id u3mr1316298qcn.17.1285244143245; Thu, 23 Sep 2010 05:15:43 -0700 (PDT) Received: from [172.16.1.1] (pool-74-96-175-150.washdc.fios.verizon.net [74.96.175.150]) by mx.google.com with ESMTPS id f15sm872766qcr.13.2010.09.23.05.15.41 (version=SSLv3 cipher=RC4-MD5); Thu, 23 Sep 2010 05:15:41 -0700 (PDT) Subject: [PATCH v2] HID: magicmouse: Use hid-input parsing rather than bypassing it From: Michael Poole To: linux-input@vger.kernel.org, Chase Douglas , Jiri Kosina Cc: Jiri Slaby , linux-kernel@vger.kernel.org Date: Thu, 23 Sep 2010 08:15:39 -0400 Message-ID: <1285244139.22958.16.camel@graviton> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 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 (demeter1.kernel.org [140.211.167.41]); Thu, 23 Sep 2010 12:15:54 +0000 (UTC) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 8791a08..5e1907a 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -279,13 +279,6 @@ static int magicmouse_raw_event(struct hid_device *hdev, int x = 0, y = 0, ii, clicks = 0, npoints; switch (data[0]) { - case 0x10: - if (size != 6) - return 0; - x = (__s16)(data[2] | data[3] << 8); - y = (__s16)(data[4] | data[5] << 8); - clicks = data[1]; - break; case TRACKPAD_REPORT_ID: /* Expect four bytes of prefix, and N*9 bytes of touch data. */