diff mbox

[2/2] Fix the issue that V8 Button pad Stick button does not work

Message ID 20170313070410.4710-2-masaki.ota@jp.alps.com (mailing list archive)
State New, archived
Headers show

Commit Message

Masaki Ota March 13, 2017, 7:04 a.m. UTC 
From: Masaki Ota <masaki.ota@jp.alps.com>
- V8 Button pad Stick Right and Middle button don't work.
- Alps stick devices have physical buttons absolutely, so delete "ALPS_BUTTONPAD" check Flag from Stick button process.

Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
---
 drivers/input/mouse/alps.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Pali Rohár March 13, 2017, 2:39 p.m. UTC | #1 
On Monday 13 March 2017 16:04:10 Masaki Ota wrote:
> From: Masaki Ota <masaki.ota@jp.alps.com>
> - V8 Button pad Stick Right and Middle button don't work.
> - Alps stick devices have physical buttons absolutely, so delete "ALPS_BUTTONPAD" check Flag from Stick button process.
> 
> Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>

Acked-by: Pali Rohár <pali.rohar@gmail.com>

> ---
>  drivers/input/mouse/alps.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index a70c860..a13404f 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -1287,10 +1287,8 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
>  	/* handle buttons */
>  	if (pkt_id == SS4_PACKET_ID_STICK) {
>  		f->ts_left = !!(SS4_BTN_V2(p) & 0x01);
> -		if (!(priv->flags & ALPS_BUTTONPAD)) {
> -			f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
> -			f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
> -		}
> +		f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
> +		f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
>  	} else {
>  		f->left = !!(SS4_BTN_V2(p) & 0x01);
>  		if (!(priv->flags & ALPS_BUTTONPAD)) {
diff mbox

Patch

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index a70c860..a13404f 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1287,10 +1287,8 @@  static int alps_decode_ss4_v2(struct alps_fields *f,
 	/* handle buttons */
 	if (pkt_id == SS4_PACKET_ID_STICK) {
 		f->ts_left = !!(SS4_BTN_V2(p) & 0x01);
-		if (!(priv->flags & ALPS_BUTTONPAD)) {
-			f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
-			f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
-		}
+		f->ts_right = !!(SS4_BTN_V2(p) & 0x02);
+		f->ts_middle = !!(SS4_BTN_V2(p) & 0x04);
 	} else {
 		f->left = !!(SS4_BTN_V2(p) & 0x01);
 		if (!(priv->flags & ALPS_BUTTONPAD)) {