lkml.org 
[lkml]   [2022]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 6/8] Input: elan_i2c - Don't set wake_irq when using ACPI
Date
The i2c-core will now handle setting the wake_irq for ACPI systems.

I didn't delete the whole block since this also covers systems that
don't use ACPI or DT, but I'm honestly not sure if that's a valid
config.

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
---

drivers/input/mouse/elan_i2c_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 7d997d2b56436b..d434c8ff8c4ca2 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1333,10 +1333,10 @@ static int elan_probe(struct i2c_client *client,
}

/*
- * Systems using device tree should set up wakeup via DTS,
+ * Systems using device tree should set up wakeup via DTS or ACPI,
* the rest will configure device as wakeup source by default.
*/
- if (!dev->of_node) {
+ if (!dev->of_node && !has_acpi_companion(dev)) {
device_init_wakeup(dev, true);
dev_pm_set_wake_irq(dev, client->irq);
}
--
2.37.2.672.g94769d06f0-goog
\
 
 \ /
  Last update: 2022-08-31 01:18    [W:0.105 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site