diff options
| author | Xiaohui Tao <xtao@nvidia.com> | 2013-09-28 10:50:42 -0700 |
|---|---|---|
| committer | Gabby Lee <galee@nvidia.com> | 2013-10-01 18:14:24 -0700 |
| commit | 4323e3b03238aafbf52831ae04a0df6e15a46f3f (patch) | |
| tree | 7df7736c432ee68b8476073c748e8edbe666abeb | |
| parent | 4fa8cb98af7cb34e28d31ef47e6effb10a458ad0 (diff) | |
input: touch: maxim_sti: Update to version 1.4.3, v29
Description:
version 1.4.3 TegraTab bringup v29 DVT3+;
Improvement:
Noise performance is also improved in this version.
Bug 1353325
Bug 1367501
Change-Id: I50a08845d4232e2d462c25bf0f7ae91eb166a141
Signed-off-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-on: http://git-master/r/280094
GVS: Gerrit_Virtual_Submit
Reviewed-by: Youngjin Kim <nkim@nvidia.com>
Reviewed-by: Gabby Lee <galee@nvidia.com>
Tested-by: Gabby Lee <galee@nvidia.com>
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 11 | ||||
| -rw-r--r-- | include/linux/maxim_sti.h | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index 3bd8e78878dc..0adc131cc840 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -1580,6 +1580,7 @@ static int processing_thread(void *arg) struct maxim_sti_pdata *pdata = dd->spi->dev.platform_data; struct sk_buff *skb; int ret, ret2; + bool fusion_dead; sched_setscheduler(current, SCHED_FIFO, &dd->thread_sched); @@ -1644,7 +1645,15 @@ static int processing_thread(void *arg) dd->suspend_in_progress = false; complete(&dd->suspend_resume); + fusion_dead = false; do { + if (dd->fusion_process != (pid_t)0 && + get_pid_task(find_get_pid( + dd->fusion_process), + PIDTYPE_PID) == NULL) { + fusion_dead = true; + break; + } ret = nl_add_attr(dd->outgoing_skb->data, FU_RESUME, NULL, 0); if (ret < 0) { @@ -1675,6 +1684,8 @@ static int processing_thread(void *arg) break; if (ret == 0) INFO("%s: resumed.", __func__); + if (fusion_dead) + continue; } /* priority 4: service interrupt */ diff --git a/include/linux/maxim_sti.h b/include/linux/maxim_sti.h index 474ccf1de6e2..74a9b2601237 100644 --- a/include/linux/maxim_sti.h +++ b/include/linux/maxim_sti.h @@ -27,8 +27,8 @@ #include "genetlink.h" #endif -#define DRIVER_VERSION "1.4.1" -#define DRIVER_RELEASE "August 14, 2013" +#define DRIVER_VERSION "1.4.3" +#define DRIVER_RELEASE "September 27, 2013" /****************************************************************************\ * Netlink: common kernel/user space macros * |