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 <[email protected]> Cc: Nick Dyer <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Henrik Rydberg <[email protected]> Signed-off-by: Tom Rini <[email protected]> --- 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
