From mboxrd@z Thu Jan 1 00:00:00 1970 From: "james.chen" Subject: [PATCH 2/2] Input: elants_i2c: fixed wake-on-touch issue Date: Mon, 4 Jan 2016 14:57:50 +0800 Message-ID: <1451890670-29705-1-git-send-email-james.chen@emc.com.tw> Return-path: Received: from emcscan.emc.com.tw ([192.72.220.5]:7564 "EHLO emcscan.emc.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271AbcADHIQ (ORCPT ); Mon, 4 Jan 2016 02:08:16 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov , Herman Lin , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, charliemooney@chromium.org, Jennifer Tsai , Scott Liu Cc: "james.chen" From: "james.chen" Fix function of wake-on-touch on suspend/resume. The function of device_may_wakeup will return true if the device supports wake-on-touch (for example, kitty and buddy). So, modify the code from "if (device_may_wakeup(dev))" to "if (!device_may_wakeup(dev))". And adjust the condition check of keep_power_in_suspend (designed for minnie). 2016.1.4: modify retry back to retry_cnt. Signed-off-by: james.chen --- drivers/input/touchscreen/elants_i2c.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 17cc20e..3739646 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -1316,24 +1316,25 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) disable_irq(client->irq); - if (device_may_wakeup(dev) || ts->keep_power_in_suspend) { + if (device_may_wakeup(dev)) { + /* + * The device will automatically enter idle mode + * that has reduced power consumption. + */ + ts->wake_irq_enabled = (enable_irq_wake(client->irq) == 0); + } else if (ts->keep_power_in_suspend) { for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) { error = elants_i2c_send(client, set_sleep_cmd, - sizeof(set_sleep_cmd)); + sizeof(set_sleep_cmd)); if (!error) break; dev_err(&client->dev, "suspend command failed: %d\n", error); } - - if (device_may_wakeup(dev)) - ts->wake_irq_enabled = - (enable_irq_wake(client->irq) == 0); } else { - elants_i2c_power_off(ts); + elants_i2c_power_off(ts); } - return 0; } @@ -1345,13 +1346,14 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) int retry_cnt; int error; - if (device_may_wakeup(dev) && ts->wake_irq_enabled) - disable_irq_wake(client->irq); - - if (ts->keep_power_in_suspend) { + if (device_may_wakeup(dev)) { + if (ts->wake_irq_enabled) + disable_irq_wake(client->irq); + elants_i2c_sw_reset(client); + } else if (ts->keep_power_in_suspend) { for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) { error = elants_i2c_send(client, set_active_cmd, - sizeof(set_active_cmd)); + sizeof(set_active_cmd)); if (!error) break; @@ -1362,7 +1364,6 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) elants_i2c_power_on(ts); elants_i2c_initialize(ts); } - ts->state = ELAN_STATE_NORMAL; enable_irq(client->irq); -- 1.8.3.2