]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: psmouse - replace flush_workqueue() with disable_delayed_work_sync()
authorDuoming Zhou <duoming@zju.edu.cn>
Wed, 17 Dec 2025 03:00:18 +0000 (11:00 +0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 12 Mar 2026 18:11:04 +0000 (11:11 -0700)
The original code uses flush_workqueue() in psmouse_disconnect() to
ensure the completion of both resync_work and dev3_register_work.
Given that alps_disconnect() already uses disable_delayed_work_sync()
to cancel dev3_register_work, replacing flush_workqueue() with
disable_delayed_work_sync(&psmouse->resync_work) is more robust
and efficient.

Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Link: https://patch.msgid.link/6e40a46e5d9e6e3237702958b8f641263c28d2e4.1765939397.git.duoming@zju.edu.cn
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/psmouse-base.c

index 0e02c997c7e5b3dcb007007bc8e933094fe6bc0f..3f34825c869105ef0b354cadb577b0fa8b7d5893 100644 (file)
@@ -1466,7 +1466,7 @@ static void psmouse_disconnect(struct serio *serio)
 
        /* make sure we don't have a resync in progress */
        mutex_unlock(&psmouse_mutex);
-       flush_workqueue(kpsmoused_wq);
+       disable_delayed_work_sync(&psmouse->resync_work);
        mutex_lock(&psmouse_mutex);
 
        if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {