diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2017-01-20 16:20:12 +0100 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2017-01-23 11:00:13 +0100 |
| commit | c0265a9488c2a3aea315b61a9239d5494997fa71 (patch) | |
| tree | 61a1ddd65c1bf40258af481c3b15a235c96e7b82 /drivers/hid | |
| parent | HID: wacom: release the resources before leaving despite devm (diff) | |
| download | linux-dev-c0265a9488c2a3aea315b61a9239d5494997fa71.tar.xz linux-dev-c0265a9488c2a3aea315b61a9239d5494997fa71.zip | |
HID: wacom: remove warning while disconnecting devices
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 0a817e69e029..4c0fa3e7ea00 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -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); |