]> git.itanic.dy.fi Git - linux-stable/commitdiff
Input: psmouse-smbus - avoid flush_scheduled_work() usage
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tue, 17 May 2022 04:04:59 +0000 (21:04 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 May 2022 04:10:14 +0000 (21:10 -0700)
Flushing system-wide workqueues is dangerous and will be forbidden.
Replace system_wq with local psmouse_wq.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: https://lore.kernel.org/r/25e2b787-cb2c-fb0d-d62c-6577ad1cd9df@I-love.SAKURA.ne.jp
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/psmouse-smbus.c

index 164f6c757f6bed637b9e04c0ce8677888b93c33a..2a2459b1b4f2cb91b0465f77637f22a0b71bcf62 100644 (file)
@@ -26,6 +26,8 @@ struct psmouse_smbus_dev {
 static LIST_HEAD(psmouse_smbus_list);
 static DEFINE_MUTEX(psmouse_smbus_mutex);
 
+static struct workqueue_struct *psmouse_smbus_wq;
+
 static void psmouse_smbus_check_adapter(struct i2c_adapter *adapter)
 {
        struct psmouse_smbus_dev *smbdev;
@@ -161,7 +163,7 @@ static void psmouse_smbus_schedule_remove(struct i2c_client *client)
                INIT_WORK(&rwork->work, psmouse_smbus_remove_i2c_device);
                rwork->client = client;
 
-               schedule_work(&rwork->work);
+               queue_work(psmouse_smbus_wq, &rwork->work);
        }
 }
 
@@ -305,9 +307,14 @@ int __init psmouse_smbus_module_init(void)
 {
        int error;
 
+       psmouse_smbus_wq = alloc_workqueue("psmouse-smbus", 0, 0);
+       if (!psmouse_smbus_wq)
+               return -ENOMEM;
+
        error = bus_register_notifier(&i2c_bus_type, &psmouse_smbus_notifier);
        if (error) {
                pr_err("failed to register i2c bus notifier: %d\n", error);
+               destroy_workqueue(psmouse_smbus_wq);
                return error;
        }
 
@@ -317,5 +324,5 @@ int __init psmouse_smbus_module_init(void)
 void psmouse_smbus_module_exit(void)
 {
        bus_unregister_notifier(&i2c_bus_type, &psmouse_smbus_notifier);
-       flush_scheduled_work();
+       destroy_workqueue(psmouse_smbus_wq);
 }