]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: synaptics_i2c - guard polling restart in resume
authorMinseong Kim <ii4gsp@gmail.com>
Wed, 21 Jan 2026 18:02:02 +0000 (10:02 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 21 Jan 2026 20:23:43 +0000 (12:23 -0800)
synaptics_i2c_resume() restarts delayed work unconditionally, even when
the input device is not opened. Guard the polling restart by taking the
input device mutex and checking input_device_enabled() before re-queuing
the delayed work.

Fixes: eef3e4cab72ea ("Input: add driver for Synaptics I2C touchpad")
Signed-off-by: Minseong Kim <ii4gsp@gmail.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260121063738.799967-1-ii4gsp@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/synaptics_i2c.c

index c8ddfff2605ffd5ebaef543ddc365bf0dd6a2cde..29da66af36d74527a33b33841d4b28adcf542aba 100644 (file)
@@ -615,13 +615,16 @@ static int synaptics_i2c_resume(struct device *dev)
        int ret;
        struct i2c_client *client = to_i2c_client(dev);
        struct synaptics_i2c *touch = i2c_get_clientdata(client);
+       struct input_dev *input = touch->input;
 
        ret = synaptics_i2c_reset_config(client);
        if (ret)
                return ret;
 
-       mod_delayed_work(system_dfl_wq, &touch->dwork,
-                               msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
+       guard(mutex)(&input->mutex);
+       if (input_device_enabled(input))
+               mod_delayed_work(system_dfl_wq, &touch->dwork,
+                                msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
 
        return 0;
 }