]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
HID: wacom: remove warning while disconnecting devices
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Fri, 20 Jan 2017 15:20:12 +0000 (16:20 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 23 Jan 2017 10:00:13 +0000 (11:00 +0100)
When the LED class gets removed, it actually tries to reset the LED.
However, the device being disconnected, the set_report fails.

Previously, the attempt to cut lose this last event was through unsetting
the HID drvdata, but it was not working properly. Simply reset the LED
groups to NULL makes a more efficient solution.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_sys.c

index 0a817e69e029f42abfe2d685274f7e3984be6215..4c0fa3e7ea007d7985533291d97925f59e75e33b 100644 (file)
@@ -757,9 +757,6 @@ static int wacom_led_control(struct wacom *wacom)
        unsigned char report_id = WAC_CMD_LED_CONTROL;
        int buf_size = 9;
 
-       if (!hid_get_drvdata(wacom->hdev))
-               return -ENODEV;
-
        if (!wacom->led.groups)
                return -ENOTSUPP;
 
@@ -2497,6 +2494,8 @@ static void wacom_remove(struct hid_device *hdev)
        if (hdev->bus == BUS_BLUETOOTH)
                device_remove_file(&hdev->dev, &dev_attr_speed);
 
+       /* make sure we don't trigger the LEDs */
+       wacom_led_groups_release(wacom);
        wacom_release_resources(wacom);
 
        hid_set_drvdata(hdev, NULL);