diff mbox

[Quantal] pull-request: fix Cypress PS/2 trackpad tap-to-click

Message ID 1348093438.6818.41.camel@fourier
State New
Headers show

Pull-request

git://kernel.ubuntu.com/kamal/ubuntu-quantal.git cypress-lp1048816

Commit Message

Kamal Mostafa Sept. 19, 2012, 10:23 p.m. UTC
This patch to the new Cypress PS/2 Trackpad driver fixes trackpad
misbehavior when the user opts to disable tap-to-click.

BugLink: http://launchpad.net/bugs/1048816

This patch affects only the Cypress PS/2 Trackpad.

Please consider applying this to Quantal.

Thanks,

 -Kamal

----------

The following changes since commit 606b55a8a5d616e2a5ca9da02f216e7ff88899a2:

  UBUNTU: Ubuntu-3.5.0-15.22 (2012-09-19 13:46:20 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/kamal/ubuntu-quantal.git cypress-lp1048816

for you to fetch changes up to 14b0357b3e1b2b67c8f9ff7626a2a4e3a11c7dd3:

  UBUNTU: SAUCE: input: Cypress PS/2 Trackpad fix disabling tap-to-click (2012-09-19 14:07:57 -0700)

----------------------------------------------------------------
Kyle Fazzari (1):
      UBUNTU: SAUCE: input: Cypress PS/2 Trackpad fix disabling tap-to-click

 drivers/input/mouse/cypress_ps2.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Tim Gardner Sept. 20, 2012, 12:46 p.m. UTC | #1

diff mbox

Patch

diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index 45afe8f..3a572ec 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -693,6 +693,14 @@  static int cypress_parse_packet(const unsigned char packet[],
 		}
 	}
 
+	/* This is only true if one of the mouse buttons were tapped.
+	 * Make sure it doesn't turn into a click. The regular tap-to-
+	 * click functionality will handle that on its own. If we don't
+	 * do this, disabling tap-to-click won't affect the mouse button
+	 * zones. */
+	if (report_data->tap)
+		report_data->left = 0;
+
 	if (report_data->contact_cnt <= 0)
 		return 0;