aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2009-02-12 04:47:36 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-12 04:47:36 +0000
commit4e9be3539e402cb2b9aa9caf5050756916b9345e (patch)
tree3000ed65bf554501ebef885d6b4bcc02bd6812d9 /drivers/input
parentde8460932576502fb6bf61968a37c4d2aed2d6e2 (diff)
fix-lis302dl-reset-threshold-on-resume.patch
Reported-by: Mickey Lauer <mickey@openmoko.org> Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/lis302dl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
index 424abbc83d1..3def0c41f8b 100644
--- a/drivers/input/misc/lis302dl.c
+++ b/drivers/input/misc/lis302dl.c
@@ -864,6 +864,10 @@ static int lis302dl_resume(struct platform_device *pdev)
for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
__reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]);
+ /* if someone had us open, reset the non-wake threshold stuff */
+ if (lis->flags & LIS302DL_F_INPUT_OPEN)
+ __enable_data_collection(lis);
+
local_irq_restore(flags);
enable_irq(lis->pdata->interrupt);