diff options
author | Mattias Wallin <mattias.wallin@stericsson.com> | 2011-05-06 18:46:42 +0200 |
---|---|---|
committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:40:13 +0200 |
commit | 5b2e3c5bbafd1d130183ad9813d925e6f3355663 (patch) | |
tree | 15dd1c02f2d3cc47093712210df3798294e9333c | |
parent | 3fd533761bc294639bf90a6fb5a515a953a963da (diff) |
input: ab8500-accdet avoid accdet irq in suspend
This patch keeps the AccDetect21Ena bit since it will cause
a accessory detect irq during suspend. This irq will be interpreted
as a button press. So this patch is to avoid generating an unwanted
button press during suspend.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
ST-Ericsson ID: ER 338639
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: na
Change-Id: Id9e13950275a3ecca1cf3363bbf00ea298bb91f7
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22567
Tested-by: Mattias WALLIN <mattias.wallin@stericsson.com>
Reviewed-by: Henrik CARLING <henrik.carling@stericsson.com>
-rw-r--r-- | drivers/input/misc/ab8500-accdet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/ab8500-accdet.c b/drivers/input/misc/ab8500-accdet.c index a17e5cfce80..2e26ad0a5d3 100644 --- a/drivers/input/misc/ab8500-accdet.c +++ b/drivers/input/misc/ab8500-accdet.c @@ -1332,11 +1332,12 @@ static int ab8500_acc_detect_suspend(struct platform_device *pdev, AB8500_ECI_AV_ACC, AB8500_ACC_DET_CTRL_REG, &acc_det_ctrl_suspend_val); + /* 0x10 = Keep AccDetect21Ena to avoid headset button irq */ (void) abx500_set_register_interruptible( &dd->pdev->dev, AB8500_ECI_AV_ACC, AB8500_ACC_DET_CTRL_REG, - 0); + 0x10); return 0; } |