[PATCH] HID: wacom: correct misreported EKR ring values

[PATCH] HID: wacom: correct misreported EKR ring values

[Aaron Armstrong Skomra]

The EKR ring claims a range of 0 to 71 but actually reports
values 1 to 72. The ring is used in relative mode so this
change should not affect users.

Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
Cc: <stable@vger.kernel.org> # v4.3+
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
---
Patch specifically targeted to v4.9.189

 drivers/hid/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 6c3bf8846b52..949761dd29ca 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -819,7 +819,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);
 
-- 
2.17.1

Re: [PATCH] HID: wacom: correct misreported EKR ring values

[Sasha Levin]

On Mon, Aug 19, 2019 at 09:41:54AM -0700, Aaron Armstrong Skomra wrote:
>The EKR ring claims a range of 0 to 71 but actually reports
>values 1 to 72. The ring is used in relative mode so this
>change should not affect users.
>
>Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
>Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
>Cc: <stable@vger.kernel.org> # v4.3+
>Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
>Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
>---
>Patch specifically targeted to v4.9.189

Is this not a problem upstream as well? Why not?

If it is, this patch will need to go upstream first, and then it'll get
to stable branches from there.

--
Thanks,
Sasha

Re: [PATCH] HID: wacom: correct misreported EKR ring values

[Sasha Levin]

On Mon, Aug 19, 2019 at 09:41:54AM -0700, Aaron Armstrong Skomra wrote:
>The EKR ring claims a range of 0 to 71 but actually reports
>values 1 to 72. The ring is used in relative mode so this
>change should not affect users.
>
>Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
>Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
>Cc: <stable@vger.kernel.org> # v4.3+
>Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
>Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
>---
>Patch specifically targeted to v4.9.189

Is this not a problem upstream as well? Why not?

If it is, this patch will need to go upstream first, and then it'll get
to stable branches from there.

Re: [PATCH] HID: wacom: correct misreported EKR ring values

[Sasha Levin]

On Mon, Aug 19, 2019 at 10:13:31AM -0700, Aaron Armstrong Skomra wrote:
>On Mon, Aug 19, 2019 at 10:02 AM Sasha Levin <sashal@kernel.org> wrote:
>
>> On Mon, Aug 19, 2019 at 09:41:54AM -0700, Aaron Armstrong Skomra wrote:
>> >The EKR ring claims a range of 0 to 71 but actually reports
>> >values 1 to 72. The ring is used in relative mode so this
>> >change should not affect users.
>> >
>> >Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
>> >Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
>> >Cc: <stable@vger.kernel.org> # v4.3+
>> >Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
>> >Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
>> >---
>> >Patch specifically targeted to v4.9.189
>>
>> Is this not a problem upstream as well? Why not?
>>
>> If it is, this patch will need to go upstream first, and then it'll get
>> to stable branches from there.
>>
>> Hi Sasha,
>I neglected my "--in-reply-to" in git send-email, I will resend. My
>apologies.

Ah, I see what happened. Looks good now, thanks!

--
Thanks,
Sasha

Re: [PATCH] HID: wacom: correct misreported EKR ring values

[Sasha Levin]

On Mon, Aug 19, 2019 at 10:13:31AM -0700, Aaron Armstrong Skomra wrote:
>On Mon, Aug 19, 2019 at 10:02 AM Sasha Levin <sashal@kernel.org> wrote:
>
>> On Mon, Aug 19, 2019 at 09:41:54AM -0700, Aaron Armstrong Skomra wrote:
>> >The EKR ring claims a range of 0 to 71 but actually reports
>> >values 1 to 72. The ring is used in relative mode so this
>> >change should not affect users.
>> >
>> >Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
>> >Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
>> >Cc: <stable@vger.kernel.org> # v4.3+
>> >Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
>> >Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
>> >---
>> >Patch specifically targeted to v4.9.189
>>
>> Is this not a problem upstream as well? Why not?
>>
>> If it is, this patch will need to go upstream first, and then it'll get
>> to stable branches from there.
>>
>> Hi Sasha,
>I neglected my "--in-reply-to" in git send-email, I will resend. My
>apologies.

Ah, I see what happened. Looks good now, thanks!

[PATCH] HID: wacom: correct misreported EKR ring values

[Aaron Armstrong Skomra]

The EKR ring claims a range of 0 to 71 but actually reports
values 1 to 72. The ring is used in relative mode so this
change should not affect users.

Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
Cc: <stable@vger.kernel.org> # v4.3+
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
---
My first attempt at sending this 
patch specifically targeted to v4.9.189

neglected the "in-reply-to" in git send-email. My apologies.

 drivers/hid/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 6c3bf8846b52..949761dd29ca 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -819,7 +819,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);
 
-- 
2.17.1

[PATCH] HID: wacom: correct misreported EKR ring values

[Aaron Armstrong Skomra]

The EKR ring claims a range of 0 to 71 but actually reports
values 1 to 72. The ring is used in relative mode so this
change should not affect users.

Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
Cc: <stable@vger.kernel.org> # v4.3+
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
---
 drivers/hid/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index abc17f2c8ef0..e314a7564236 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1098,7 +1098,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
 	input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
 	if (data[12] & 0x80)
-		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
 	else
 		input_report_abs(input, ABS_WHEEL, 0);
 
-- 
2.17.1

Re: [PATCH] HID: wacom: correct misreported EKR ring values

[Jiri Kosina]

On Fri, 16 Aug 2019, Aaron Armstrong Skomra wrote:

> The EKR ring claims a range of 0 to 71 but actually reports
> values 1 to 72. The ring is used in relative mode so this
> change should not affect users.
> 
> Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
> Fixes: 72b236d60218f ("HID: wacom: Add support for Express Key Remote.")
> Cc: <stable@vger.kernel.org> # v4.3+
> Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
> Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>

Queued for 5.3, thanks Aaron.

-- 
Jiri Kosina
SUSE Labs