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

Commit 08c453f6 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Benjamin Tissoires
Browse files

HID: logitech-hidpp: do all FF cleanup in hidpp_ff_destroy() 



All of the FF-related resources belong to corresponding FF device, so
they should be freed as a part of hidpp_ff_destroy() to avoid
potential race condidions.

Fixes: ff21a635 ("HID: logitech-hidpp: Force feedback support for the Logitech G920")
Suggested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Henrik Rydberg <rydberg@bitmath.org>
Cc: Pierre-Loup A. Griffais <pgriffais@valvesoftware.com>
Cc: Austin Palmer <austinp@valvesoftware.com>
Cc: linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org # 5.2+
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 905d754c

drivers/hid/hid-logitech-hidpp.c

+5 −28
Original line number Diff line number Diff line
@@ -2078,7 +2078,12 @@ static DEVICE_ATTR(range, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH, hidpp 
static void hidpp_ff_destroy(struct ff_device *ff)

{

	struct hidpp_ff_private_data *data = ff->private;

	struct hid_device *hid = data->hidpp->hid_dev;



	hid_info(hid, "Unloading HID++ force feedback.\n");



	device_remove_file(&hid->dev, &dev_attr_range);

	destroy_workqueue(data->wq);

	kfree(data->effect_ids);

}
@@ -2170,31 +2175,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, 
	return 0;

}



static int hidpp_ff_deinit(struct hid_device *hid)

{

	struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);

	struct input_dev *dev = hidinput->input;

	struct hidpp_ff_private_data *data;



	if (!dev) {

		hid_err(hid, "Struct input_dev not found!\n");

		return -EINVAL;

	}



	hid_info(hid, "Unloading HID++ force feedback.\n");

	data = dev->ff->private;

	if (!data) {

		hid_err(hid, "Private data not found!\n");

		return -EINVAL;

	}



	destroy_workqueue(data->wq);

	device_remove_file(&hid->dev, &dev_attr_range);



	return 0;

}





/* ************************************************************************** */

/*                                                                            */

/* Device Support                                                             */
@@ -3713,9 +3693,6 @@ static void hidpp_remove(struct hid_device *hdev) 


	sysfs_remove_group(&hdev->dev.kobj, &ps_attribute_group);



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)

		hidpp_ff_deinit(hdev);



	hid_hw_stop(hdev);

	cancel_work_sync(&hidpp->work);

	mutex_destroy(&hidpp->send_mutex);