[PATCH v2] elantech: Fix detection of touchpads where the revision matches a known rate

[PATCH v2] elantech: Fix detection of touchpads where the revision matches a known rate

[Hans de Goede]

Make the check to skip the rate check more lax, so that it applies
to all hw_version 4 models.

This fixes the touchpad not being detected properly on Asus PU551LA
laptops.

Cc: stable@vger.kernel.org
Reported-and-tested-by: David Zafra Gómez <dezeta@klo.es>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-Update the comment above the check to match the new code
---
 drivers/input/mouse/elantech.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 79363b6..f181d73 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1376,10 +1376,11 @@ static bool elantech_is_signature_valid(const unsigned char *param)
 		return true;
 
 	/*
-	 * Some models have a revision higher then 20. Meaning param[2] may
-	 * be 10 or 20, skip the rates check for these.
+	 * Some hw_version >= 4 models have a revision higher then 20. Meaning
+	 * that param[2] may be 10 or 20, skip the rates check for these.
 	 */
-	if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
+	if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f &&
+	    param[2] < 40)
 		return true;
 
 	for (i = 0; i < ARRAY_SIZE(rates); i++)
-- 
2.4.2

Re: [PATCH v2] elantech: Fix detection of touchpads where the revision matches a known rate

[Dmitry Torokhov]

On Tue, Jun 02, 2015 at 11:33:37AM +0200, Hans de Goede wrote:
> Make the check to skip the rate check more lax, so that it applies
> to all hw_version 4 models.
> 
> This fixes the touchpad not being detected properly on Asus PU551LA
> laptops.
> 
> Cc: stable@vger.kernel.org
> Reported-and-tested-by: David Zafra Gómez <dezeta@klo.es>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied, thank you.

> ---
> Changes in v2:
> -Update the comment above the check to match the new code
> ---
>  drivers/input/mouse/elantech.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 79363b6..f181d73 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1376,10 +1376,11 @@ static bool elantech_is_signature_valid(const unsigned char *param)
>  		return true;
>  
>  	/*
> -	 * Some models have a revision higher then 20. Meaning param[2] may
> -	 * be 10 or 20, skip the rates check for these.
> +	 * Some hw_version >= 4 models have a revision higher then 20. Meaning
> +	 * that param[2] may be 10 or 20, skip the rates check for these.
>  	 */
> -	if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
> +	if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f &&
> +	    param[2] < 40)
>  		return true;
>  
>  	for (i = 0; i < ARRAY_SIZE(rates); i++)
> -- 
> 2.4.2
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] elantech: Fix detection of touchpads where the revision matches a known rate

[ulrik.debie-os]

On Tue, Jun 02, 2015 at 11:33:37AM +0200, Hans de Goede wrote:
> 
> Make the check to skip the rate check more lax, so that it applies
> to all hw_version 4 models.
> 
> This fixes the touchpad not being detected properly on Asus PU551LA
> laptops.
> 
> Cc: stable@vger.kernel.org
> Reported-and-tested-by: David Zafra Gómez <dezeta@klo.es>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v2:
> -Update the comment above the check to match the new code
> ---
>  drivers/input/mouse/elantech.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 79363b6..f181d73 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1376,10 +1376,11 @@ static bool elantech_is_signature_valid(const unsigned char *param)
>  		return true;
>  
>  	/*
> -	 * Some models have a revision higher then 20. Meaning param[2] may
> -	 * be 10 or 20, skip the rates check for these.
> +	 * Some hw_version >= 4 models have a revision higher then 20. Meaning
> +	 * that param[2] may be 10 or 20, skip the rates check for these.
>  	 */
Excellent, thanks !
> -	if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
> +	if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f &&
> +	    param[2] < 40)
>  		return true;
>  
>  	for (i = 0; i < ARRAY_SIZE(rates); i++)
> -- 
> 2.4.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html