summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rcollins@nvidia.com>2013-11-01 09:21:05 -0700
committerGabby Lee <galee@nvidia.com>2013-11-06 18:19:07 -0800
commitadaca03e9dfcd34e13a82a8fe6b1e42e20092aab (patch)
tree32f1dacff391dfb0df40334be4b01f3097e9de84
parentc835182402f2b3cd2345a4c9b193b08d18639fde (diff)
input: touch: maxim: fix daemon crashing issuedaily-2013.11.07.0_rel-tegratab-partner
Bug 1352711 Change-Id: I9aef28429790f2be88b9b4724562115d5ba6e3eb Signed-off-by: Robert Collins <rcollins@nvidia.com> Reviewed-on: http://git-master/r/325614 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: David Jung <djung@nvidia.com> Tested-by: David Jung <djung@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Gabby Lee <galee@nvidia.com>
-rw-r--r--drivers/input/touchscreen/maxim_sti.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c
index 0ce23fba16cd..363026d74883 100644
--- a/drivers/input/touchscreen/maxim_sti.c
+++ b/drivers/input/touchscreen/maxim_sti.c
@@ -1587,7 +1587,8 @@ static int processing_thread(void *arg)
/* priority 1: start up fusion process */
if (dd->fusion_process != (pid_t)0 && get_pid_task(
find_get_pid(dd->fusion_process),
- PIDTYPE_PID) == NULL) {
+ PIDTYPE_PID) == NULL &&
+ !dd->suspend_in_progress) {
stop_scan_canned(dd);
dd->start_fusion = true;
dd->fusion_process = (pid_t)0;