summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2024-06-07 08:02:48 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2024-07-01 21:10:46 +0200
commit5f82c1e04721e7cd98e604eb4e58f0724d8e5a65 (patch)
tree4394e6a2d413287138d96346ce052e12a85c1590 /drivers/input
parentInput: ili210x - use guard notation when disabling and reenabling IRQ (diff)
downloadlinux-5f82c1e04721e7cd98e604eb4e58f0724d8e5a65.tar.xz
linux-5f82c1e04721e7cd98e604eb4e58f0724d8e5a65.zip
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Make sure interrupts are not left disabled when we fail to suspend the touch controller. Fixes: 6696777c6506 ("Input: add driver for Elan I2C/SMbus touchpad") Link: https://lore.kernel.org/r/ZmKiiL-1wzKrhqBj@google.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/elan_i2c_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index c2aec5c360b3..ce96513b34f6 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1356,6 +1356,8 @@ static int elan_suspend(struct device *dev)
}
err:
+ if (ret)
+ enable_irq(client->irq);
mutex_unlock(&data->sysfs_mutex);
return ret;
}