Patchwork HID: wacom: leds: Don't try to control the EKR's read-only LEDs

login
register
mail settings
Submitter Aaron Armstrong Skomra
Date Aug. 28, 2017, 9:15 p.m.
Message ID <1503954939-23470-1-git-send-email-skomra@gmail.com>
Download mbox | patch
Permalink /patch/9926181/
State New
Headers show

Comments

Aaron Armstrong Skomra - Aug. 28, 2017, 9:15 p.m.
Commit a50aac7193f1 introduces 'led.groups' and adds EKR support
for these groups. However, unlike the other devices with LEDs,
the EKR's LEDs are read-only and we shouldn't attempt to control
them in wacom_led_control().

See bug: https://sourceforge.net/p/linuxwacom/bugs/342/

Fixes: a50aac7193f1 ("HID: wacom: leds: dynamically allocate LED groups")
Cc: stable <stable@vger.kernel.org>     # 4.9
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
---
 drivers/hid/wacom_sys.c | 3 +++
 1 file changed, 3 insertions(+)
Jason Gerecke - Aug. 29, 2017, 4:24 p.m.
On Mon, Aug 28, 2017 at 2:15 PM, Aaron Armstrong Skomra
<skomra@gmail.com> wrote:
>
> Commit a50aac7193f1 introduces 'led.groups' and adds EKR support
> for these groups. However, unlike the other devices with LEDs,
> the EKR's LEDs are read-only and we shouldn't attempt to control
> them in wacom_led_control().
>
> See bug: https://sourceforge.net/p/linuxwacom/bugs/342/
>
> Fixes: a50aac7193f1 ("HID: wacom: leds: dynamically allocate LED groups")
> Cc: stable <stable@vger.kernel.org>     # 4.9
> Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>

Looks good to me:
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one  /
(That is to say, eight) to the two,     /
But you can’t take seven from three,    /
So you look at the sixty-fours....

>
> ---
>  drivers/hid/wacom_sys.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> index 838c1ebfffa9..db1f64dcb9ba 100644
> --- a/drivers/hid/wacom_sys.c
> +++ b/drivers/hid/wacom_sys.c
> @@ -766,6 +766,9 @@ static int wacom_led_control(struct wacom *wacom)
>         if (!wacom->led.groups)
>                 return -ENOTSUPP;
>
> +       if (wacom->wacom_wac.features.type == REMOTE)
> +               return -ENOTSUPP;
> +
>         if (wacom->wacom_wac.pid) { /* wireless connected */
>                 report_id = WAC_CMD_WL_LED_CONTROL;
>                 buf_size = 13;
> --
> 2.7.4
>
--
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
Jiri Kosina - Sept. 6, 2017, 8:48 a.m.
On Mon, 28 Aug 2017, Aaron Armstrong Skomra wrote:

> Commit a50aac7193f1 introduces 'led.groups' and adds EKR support
> for these groups. However, unlike the other devices with LEDs,
> the EKR's LEDs are read-only and we shouldn't attempt to control
> them in wacom_led_control().
> 
> See bug: https://sourceforge.net/p/linuxwacom/bugs/342/
> 
> Fixes: a50aac7193f1 ("HID: wacom: leds: dynamically allocate LED groups")
> Cc: stable <stable@vger.kernel.org>     # 4.9
> Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>

Applied to for-4.14/upstream-fixes.

Patch

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 838c1ebfffa9..db1f64dcb9ba 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -766,6 +766,9 @@  static int wacom_led_control(struct wacom *wacom)
 	if (!wacom->led.groups)
 		return -ENOTSUPP;
 
+	if (wacom->wacom_wac.features.type == REMOTE)
+		return -ENOTSUPP;
+
 	if (wacom->wacom_wac.pid) { /* wireless connected */
 		report_id = WAC_CMD_WL_LED_CONTROL;
 		buf_size = 13;