From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 7 Jun 2024 06:02:48 +0000 (-0700)
Subject: Input: elan_i2c - do not leave interrupt disabled on suspend failure
X-Git-Tag: v6.11-rc1~98^2^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f82c1e04721e7cd98e604eb4e58f0724d8e5a65;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index c2aec5c360b3b..ce96513b34f64 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;
 }