diff options
| author | Bo Kim <bok@nvidia.com> | 2013-10-14 17:15:53 +0900 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2013-11-06 23:26:27 -0800 |
| commit | ce2ba962988bacc50bba26896fd6e257a974a2ac (patch) | |
| tree | 51693ccfe4ee1d7c78cc78a258579736caa6cc61 | |
| parent | 1bc450b4caa8c4278f1319762831c4eac9d35af2 (diff) | |
Revert "input: touch: maxim_sti: Shutdown safely"
This reverts commit 87de1d533241169695c552e837f024208d98c670.
The latest maxim release processes shutdown as well.
Conflicts:
drivers/input/touchscreen/maxim_sti.c
Change-Id: Ic6b506c873a98413bc5bb51dd2d2e79019177622
Signed-off-by: Bo Kim <bok@nvidia.com>
Reviewed-on: http://git-master/r/298916
(cherry picked from commit 52d61d13335287dba7e4b37406ba2b62eb05caf4)
Reviewed-on: http://git-master/r/327437
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index 23910d6752ee..bc7af341b5b4 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -1836,12 +1836,6 @@ static int remove(struct spi_device *spi) INFO("removing...\n"); - if (dd->irq_registered) - disable_irq(dd->spi->irq); - - dd->nl_enabled = false; - (void)kthread_stop(dd->thread); - if (dd->fusion_process != (pid_t)0) (void)kill_pid(find_get_pid(dd->fusion_process), SIGKILL, 1); @@ -1891,17 +1885,6 @@ static void shutdown(struct spi_device *spi) INFO("doing shutdown...\n"); - if (dd->irq_registered) - disable_irq(dd->spi->irq); - - dd->nl_enabled = false; - (void)kthread_stop(dd->thread); - - if (dd->fusion_process != (pid_t)0) - (void)kill_pid(find_get_pid(dd->fusion_process), SIGKILL, 1); - - stop_scan_canned(dd); - pdata->reset(pdata, 0); usleep_range(100, 120); regulator_control(dd, false); |