From adaca03e9dfcd34e13a82a8fe6b1e42e20092aab Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 1 Nov 2013 09:21:05 -0700 Subject: input: touch: maxim: fix daemon crashing issue Bug 1352711 Change-Id: I9aef28429790f2be88b9b4724562115d5ba6e3eb Signed-off-by: Robert Collins Reviewed-on: http://git-master/r/325614 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: David Jung Tested-by: David Jung GVS: Gerrit_Virtual_Submit Reviewed-by: Gabby Lee --- drivers/input/touchscreen/maxim_sti.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3