diff options
| author | Vincent Chen <zochen@nvidia.com> | 2014-03-04 17:17:42 -0800 |
|---|---|---|
| committer | Mitch Luban <mluban@nvidia.com> | 2014-03-06 17:49:23 -0800 |
| commit | 228fd4aec04a366dad887edf833f219a01ab80f6 (patch) | |
| tree | 662dd3fdc8ae24103bd5f8d4685c763680caee1f /drivers/input/touchscreen/maxim_sti.c | |
| parent | b5d6a99ab751c80778888329d83465c55d519de5 (diff) | |
input: touch: maxim: disable tap to wake
bug 1394437
Change-Id: I0ca2b387f8ba075a3c2e4a33c1f010bd4cd44ef0
Signed-off-by: Vincent Chen <zochen@nvidia.com>
Reviewed-on: http://git-master/r/377479
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Hon Fei Chong <hchong@nvidia.com>
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'drivers/input/touchscreen/maxim_sti.c')
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index 39041c3eb2de..19189e9cb09f 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -39,8 +39,8 @@ #define INPUT_DEVICES 2 #define INPUT_ENABLE_DISABLE 0 #define FB_CALLBACK 1 -#define SUSPEND_POWER_OFF 1 -#define DOUBLE_TAP 1 +#define SUSPEND_POWER_OFF 0 +#define DOUBLE_TAP 0 #define NV_ENABLE_CPU_BOOST 1 #define NV_STYLUS_FINGER_EXCLUSION 1 @@ -947,9 +947,11 @@ nl_process_driver_msg(struct dev_data *dd, u16 msg_id, void *msg) u8 i, inp; int ret; +#if DOUBLE_TAP || SUSPEND_POWER_OFF if (dd->expect_resume_ack && msg_id != DR_DECONFIG && msg_id != DR_RESUME_ACK) return false; +#endif switch (msg_id) { case DR_ADD_MC_GROUP: @@ -1736,7 +1738,6 @@ static int processing_thread(void *arg) INFO("%s: suspended.", __func__); - dd->expect_resume_ack = true; while (!dd->resume_in_progress) { /* the line below is a MUST */ set_current_state(TASK_INTERRUPTIBLE); @@ -2048,7 +2049,7 @@ static struct spi_driver driver = { .driver = { .name = MAXIM_STI_NAME, .owner = THIS_MODULE, -#ifdef CONFIG_PM_SLEEP +#if defined(CONFIG_PM_SLEEP) && DOUBLE_TAP .pm = &pm_ops, #endif }, |