summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/input/touchscreen/maxim_sti.c4
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) {