diff options
| author | Robert Collins <rcollins@nvidia.com> | 2013-11-01 09:21:05 -0700 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2013-11-06 23:27:18 -0800 |
| commit | 62a1c3b203c1ea1dded54187041002de0617462b (patch) | |
| tree | 617cf9eb411dd5b9ebc18a96917743171cc74548 | |
| parent | 38de984126dad63a10e6fc95507bebe917ea0db0 (diff) | |
input: touch: maxim: fix daemon crashing issue
Bug 1352711
Change-Id: I9aef28429790f2be88b9b4724562115d5ba6e3eb
Signed-off-by: Robert Collins <rcollins@nvidia.com>
Reviewed-on: http://git-master/r/325614
(cherry picked from commit adaca03e9dfcd34e13a82a8fe6b1e42e20092aab)
Reviewed-on: http://git-master/r/327439
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index abae474ecefb..c794053c4c67 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; |