diff options
| author | Bo Kim <bok@nvidia.com> | 2013-11-12 14:44:30 +0900 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2013-11-12 00:58:19 -0800 |
| commit | ea70be4d831ccb26d02eaf7ed79c085923c52e98 (patch) | |
| tree | 874131f9fa396b041ee2a29b47a2cc449e53a6ee /drivers | |
| parent | 3fd9e9e13d7b931187749f458c5cc44ac3219bfa (diff) | |
Revert "Revert "input: touch: maxim_sti: boot fusion from init""
This reverts commit 38de984126dad63a10e6fc95507bebe917ea0db0.
Bug 404490
Change-Id: I3b540b0c66c7978866f9216c2ddda877773c6b81
Signed-off-by: Bo Kim <bok@nvidia.com>
Reviewed-on: http://git-master/r/329440
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index abae474ecefb..bc7af341b5b4 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -66,7 +66,6 @@ struct dev_data { u32 nl_seq; u8 nl_mc_group_count; bool nl_enabled; - bool start_fusion; bool suspend_in_progress; bool resume_in_progress; bool expect_resume_ack; @@ -1566,9 +1565,6 @@ static int processing_thread(void *arg) struct dev_data *dd = arg; struct maxim_sti_pdata *pdata = dd->spi->dev.platform_data; struct sk_buff *skb; - char *argv[] = { pdata->touch_fusion, "daemon", - pdata->nl_family, - pdata->config_file, NULL }; int ret, ret2; bool fusion_dead; @@ -1589,21 +1585,11 @@ static int processing_thread(void *arg) find_get_pid(dd->fusion_process), PIDTYPE_PID) == NULL) { stop_scan_canned(dd); - dd->start_fusion = true; dd->fusion_process = (pid_t)0; #if INPUT_ENABLE_DISABLE dd->input_no_deconfig = true; #endif } - if (dd->start_fusion) { - do { - ret = call_usermodehelper(argv[0], argv, NULL, - UMH_WAIT_EXEC); - if (ret != 0) - msleep(100); - } while (ret != 0 && !kthread_should_stop()); - dd->start_fusion = false; - } if (kthread_should_stop()) break; @@ -1825,7 +1811,6 @@ static int probe(struct spi_device *spi) #endif /* start up Touch Fusion */ - dd->start_fusion = true; wake_up_process(dd->thread); INFO("driver loaded; version %s; release date %s", DRIVER_VERSION, DRIVER_RELEASE); |