lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/1] Input: cypress_ps2 - Return zero finger count if palm is detected.
From
Date
On Tue, 2013-09-24 at 11:44 -0400, Joseph Salisbury wrote:
> BugLink: http://bugs.launchpad.net/bugs/1229361
>
> This patch sets the finger count to 0 in the case of palm contact.
>
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> (maintainer:INPUT (KEYBOARD,...,commit_signer:2/2=100%)
> Cc: Henrik Rydberg <rydberg@euromail.se> (maintainer:INPUT MULTITOUCH...)
> Cc: Kamal Mostafa <kamal@canonical.com> (commit_signer:2/2=100%)
> Cc: Dudley Du <dudl@cypress.com> (commit_signer:2/2=100%)
> Cc: Kyle Fazzari <git@status.e4ward.com> (commit_signer:1/2=50%)
> Cc: Tim Gardner <tim.gardner@canonical.com> (commit_signer:1/2=50%)
> Cc: linux-input@vger.kernel.org (open list:INPUT (KEYBOARD,...)
> Cc: linux-kernel@vger.kernel.org (open list)
> Cc: stable@vger.kernel.org

This patch works fine: eliminates stream of junk driver messages with no
ill effects.

Tested-by: Kamal Mostafa <kamal@canonical.com>

-Kamal


> ---
> drivers/input/mouse/cypress_ps2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
> index 45b3eda..95b2c40 100644
> --- a/drivers/input/mouse/cypress_ps2.c
> +++ b/drivers/input/mouse/cypress_ps2.c
> @@ -441,7 +441,7 @@ static int cypress_get_finger_count(unsigned char header_byte)
> case 2: return 5;
> default:
> /* Invalid contact (e.g. palm). Ignore it. */
> - return -1;
> + return 0;
> }
> }
>
> @@ -460,7 +460,7 @@ static int cypress_parse_packet(struct psmouse *psmouse,
>
> contact_cnt = cypress_get_finger_count(header_byte);
>
> - if (contact_cnt < 0) /* e.g. palm detect */
> + if (contact_cnt < 0)
> return -EINVAL;
>
> report_data->contact_cnt = contact_cnt;

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-10-01 01:41    [W:0.103 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site