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

[ Upstream commit 711bcc0cb34e96a60e88d7b0260862781de3e530 ]

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: c0549b72d99d ("platform/x86: lenovo-yogabook-wmi: Add driver for Lenovo Yoga Book")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230430165807.472798-4-hdegoede@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/lenovo-yogabook-wmi.c b/drivers/platform/x86/lenovo-yogabook-wmi.c
index 3a6de4a..5948ffa 100644 (file)
--- a/drivers/platform/x86/lenovo-yogabook-wmi.c
+++ b/drivers/platform/x86/lenovo-yogabook-wmi.c
@@ -332,9 +332,20 @@ error_put_devs:
 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);