Commit 04b7762e authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov

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: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220131135436.29638-2-hdegoede@redhat.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 81a36d8c
...@@ -1388,17 +1388,17 @@ static int __maybe_unused elan_resume(struct device *dev) ...@@ -1388,17 +1388,17 @@ static int __maybe_unused elan_resume(struct device *dev)
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
int error; int error;
if (device_may_wakeup(dev) && data->irq_wake) { if (!device_may_wakeup(dev)) {
error = regulator_enable(data->vcc);
if (error) {
dev_err(dev, "error %d enabling regulator\n", error);
goto err;
}
} else if (data->irq_wake) {
disable_irq_wake(client->irq); disable_irq_wake(client->irq);
data->irq_wake = false; data->irq_wake = false;
} }
error = regulator_enable(data->vcc);
if (error) {
dev_err(dev, "error %d enabling regulator\n", error);
goto err;
}
error = elan_set_power(data, true); error = elan_set_power(data, true);
if (error) { if (error) {
dev_err(dev, "power up when resuming failed: %d\n", error); dev_err(dev, "power up when resuming failed: %d\n", error);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment