Messages in this thread Patch in this message | | | From | Tom Rini <> | Subject | [PATCH] Revert "Input: atmel_mxt_ts - disable interrupt for 50ms after reset" | Date | Thu, 7 Apr 2016 18:52:25 -0400 |
| |
This reverts commit 885f3fb9fa1f9e185e8a4e905157087495734349 due to this change breaking the touchpad on the Chromebook Pixel 2015 on resume from sleep or warm resets.
Cc: Olof Johansson <olof@lixom.net> Cc: Nick Dyer <nick.dyer@itdev.co.uk> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Henrik Rydberg <rydberg@bitmath.org> Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/input/touchscreen/atmel_mxt_ts.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 2160512..9b92b60 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1098,9 +1098,7 @@ static int mxt_soft_reset(struct mxt_data *data) struct device *dev = &data->client->dev; int ret = 0; - dev_info(dev, "Resetting device\n"); - - disable_irq(data->irq); + dev_info(dev, "Resetting chip\n"); reinit_completion(&data->reset_completion); @@ -1108,11 +1106,6 @@ static int mxt_soft_reset(struct mxt_data *data) if (ret) return ret; - /* Ignore CHG line for 100ms after reset */ - msleep(100); - - enable_irq(data->irq); - ret = mxt_wait_for_completion(data, &data->reset_completion, MXT_RESET_TIMEOUT); if (ret) -- 1.7.9.5
| |