Commit 711bcc0c authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: lenovo-yogabook: Reprobe devices on remove() 



Ensure that both the keyboard touchscreen and the digitizer have their
driver bound after remove(). Without this modprobing lenovo-yogabook-wmi
after a rmmod fails because lenovo-yogabook-wmi defers probing until
both devices have their driver bound.

Fixes: c0549b72 ("platform/x86: lenovo-yogabook-wmi: Add driver for Lenovo Yoga Book")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230430165807.472798-4-hdegoede@redhat.com
parent 9148cd2e

drivers/platform/x86/lenovo-yogabook-wmi.c

+11 −0
Original line number Diff line number Diff line
@@ -332,9 +332,20 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context) 
static void yogabook_wmi_remove(struct wmi_device *wdev)

{

	struct yogabook_wmi *data = dev_get_drvdata(&wdev->dev);

	int r = 0;



	free_irq(data->backside_hall_irq, data);

	cancel_work_sync(&data->work);



	if (!test_bit(YB_KBD_IS_ON, &data->flags))

		r |= device_reprobe(data->kbd_dev);



	if (!test_bit(YB_DIGITIZER_IS_ON, &data->flags))

		r |= device_reprobe(data->dig_dev);



	if (r)

		dev_warn(&wdev->dev, "Reprobe of devices failed\n");



	put_device(data->dig_dev);

	put_device(data->kbd_dev);

	acpi_dev_put(data->dig_adev);