Skip to content

Commit

Permalink
HID: wacom: remove warning while disconnecting devices
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Jan 23, 2017
1 parent 5b779fc commit c0265a9
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/hid/wacom_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c0265a9

Please sign in to comment.