Re: [PATCH 1/1] Input: cypress_ps2 - Return zero finger count ifpalm is detected.

[Kamal Mostafa]

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@xxxxxxxxxxxxx>
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> (maintainer:INPUT (KEYBOARD,...,commit_signer:2/2=100%)
> Cc: Henrik Rydberg <rydberg@xxxxxxxxxxx> (maintainer:INPUT MULTITOUCH...)
> Cc: Kamal Mostafa <kamal@xxxxxxxxxxxxx> (commit_signer:2/2=100%)
> Cc: Dudley Du <dudl@xxxxxxxxxxx> (commit_signer:2/2=100%)
> Cc: Kyle Fazzari <git@xxxxxxxxxxxxxxxxx> (commit_signer:1/2=50%)
> Cc: Tim Gardner <tim.gardner@xxxxxxxxxxxxx> (commit_signer:1/2=50%)
> Cc: linux-input@xxxxxxxxxxxxxxx (open list:INPUT (KEYBOARD,...)
> Cc: linux-kernel@xxxxxxxxxxxxxxx (open list)
> Cc: stable@xxxxxxxxxxxxxxx

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

Tested-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>

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

Attachment: signature.asc
Description: This is a digitally signed message part