summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/maxim_sti.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/touchscreen/maxim_sti.c')
-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;