Skip to content

Commit 04b7762

Browse files
jwrdegoededtor
authored andcommitted
Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
Before these changes elan_suspend() would only disable the regulator when device_may_wakeup() returns false; whereas elan_resume() would unconditionally enable it, leading to an enable count imbalance when device_may_wakeup() returns true. This triggers the "WARN_ON(regulator->enable_count)" in regulator_put() when the elan_i2c driver gets unbound, this happens e.g. with the hot-plugable dock with Elan I2C touchpad for the Asus TF103C 2-in-1. Fix this by making the regulator_enable() call also be conditional on device_may_wakeup() returning false. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20220131135436.29638-2-hdegoede@redhat.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 81a36d8 commit 04b7762

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/input/mouse/elan_i2c_core.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,17 +1388,17 @@ static int __maybe_unused elan_resume(struct device *dev)
13881388
struct elan_tp_data *data = i2c_get_clientdata(client);
13891389
int error;
13901390

1391-
if (device_may_wakeup(dev) && data->irq_wake) {
1391+
if (!device_may_wakeup(dev)) {
1392+
error = regulator_enable(data->vcc);
1393+
if (error) {
1394+
dev_err(dev, "error %d enabling regulator\n", error);
1395+
goto err;
1396+
}
1397+
} else if (data->irq_wake) {
13921398
disable_irq_wake(client->irq);
13931399
data->irq_wake = false;
13941400
}
13951401

1396-
error = regulator_enable(data->vcc);
1397-
if (error) {
1398-
dev_err(dev, "error %d enabling regulator\n", error);
1399-
goto err;
1400-
}
1401-
14021402
error = elan_set_power(data, true);
14031403
if (error) {
14041404
dev_err(dev, "power up when resuming failed: %d\n", error);

0 commit comments

Comments
 (0)