diff options
| author | David Jung <djung@nvidia.com> | 2013-09-25 16:21:32 -0700 |
|---|---|---|
| committer | Gabby Lee <galee@nvidia.com> | 2013-09-26 03:53:15 -0700 |
| commit | 931518312b66555c862137dfbaaebc8e4265cafe (patch) | |
| tree | 4178f803a6d065712c9cd70e1614083b3ee19b7e /drivers | |
| parent | 5ea5ab3e0910cf77d24a38f520bb03616afb11be (diff) | |
input: touch: maxim: fix daemon crashing issue
Nvidia changes to fix the problem when the daemon crashes and the touch
is not responding after resume when display is off.
Bug 1353325
Change-Id: I4a2917ae2070a4a6500d7e03833218534c117250
Signed-off-by: David Jung <djung@nvidia.com>
Reviewed-on: http://git-master/r/279074
Reviewed-by: Gabby Lee <galee@nvidia.com>
Tested-by: Gabby Lee <galee@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index a50e88748181..3bd8e78878dc 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -900,7 +900,8 @@ nl_process_driver_msg(struct dev_data *dd, u16 msg_id, void *msg) int ret; if (dd->expect_resume_ack && msg_id != DR_DECONFIG && - msg_id != DR_RESUME_ACK) + msg_id != DR_RESUME_ACK && msg_id != DR_CONFIG_WATCHDOG && + msg_id != DR_ADD_MC_GROUP && msg_id != DR_ECHO_REQUEST) return false; switch (msg_id) { @@ -1074,6 +1075,7 @@ nl_process_driver_msg(struct dev_data *dd, u16 msg_id, void *msg) case DR_CONFIG_WATCHDOG: config_watchdog_msg = msg; dd->fusion_process = (pid_t)config_watchdog_msg->pid; + dd->expect_resume_ack = false; return false; case DR_DECONFIG: if (dd->irq_registered) { |