Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0265a94 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

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: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5b779fc5

drivers/hid/wacom_sys.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -757,9 +757,6 @@ static int wacom_led_control(struct wacom *wacom) 
	unsigned char report_id = WAC_CMD_LED_CONTROL;

	unsigned char report_id = WAC_CMD_LED_CONTROL;

	int buf_size = 9;

	int buf_size = 9;





	if (!hid_get_drvdata(wacom->hdev))

		return -ENODEV;



	if (!wacom->led.groups)

	if (!wacom->led.groups)

		return -ENOTSUPP;

		return -ENOTSUPP;
@@ -2497,6 +2494,8 @@ static void wacom_remove(struct hid_device *hdev) 
	if (hdev->bus == BUS_BLUETOOTH)

	if (hdev->bus == BUS_BLUETOOTH)

		device_remove_file(&hdev->dev, &dev_attr_speed);

		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);

	wacom_release_resources(wacom);





	hid_set_drvdata(hdev, NULL);

	hid_set_drvdata(hdev, NULL);