summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorJordan Nien <jnien@nvidia.com>2013-12-30 14:53:41 +0800
committerThomas Cherry <tcherry@nvidia.com>2014-01-08 10:25:55 -0800
commitad98bd08dbc491f2c4a270d4ea1ef04316cf7ea0 (patch)
tree9fda1741a9dc741c1246919a76f7e2810913558d /drivers/input/touchscreen
parenta00d88265b44c075ac6ae746a45b64bd082f2ac5 (diff)
input: touch: maxim: correct resume.
Bug 1430031 Bug 1430286 Change-Id: I79e3db334ab227ba867a51f5edb2d4b448f664fd Signed-off-by: Jordan Nien <jnien@nvidia.com> Reviewed-on: http://git-master/r/350484 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Vincent Chen <zochen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: David Jung <djung@nvidia.com> Reviewed-by: Hon Fei Chong <hchong@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/maxim_sti.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c
index df1ee2180e8d..fe407a8b61fe 100644
--- a/drivers/input/touchscreen/maxim_sti.c
+++ b/drivers/input/touchscreen/maxim_sti.c
@@ -1627,6 +1627,8 @@ static int processing_thread(void *arg)
complete(&dd->suspend_resume);
INFO("%s: suspended.", __func__);
+
+ dd->expect_resume_ack = true;
while (!dd->resume_in_progress) {
/* the line below is a MUST */
set_current_state(TASK_INTERRUPTIBLE);