From ab4d3807d33214ac1075874de37d230c6ee61cf5 Mon Sep 17 00:00:00 2001 From: Nick Dyer Date: Fri, 3 May 2013 15:14:13 +0100 Subject: [PATCH] Input: atmel_mxt_ts - Ignore error from CHG line after bootloading Some bootloader versions do not assert the CHG line after bootloading has finished, therefore we should not fail the bootloading process if it doesn't happen. Signed-off-by: Nick Dyer --- drivers/input/touchscreen/atmel_mxt_ts.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 649b2fdf5bb39b..5fe38c7ed30be2 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -2490,10 +2490,7 @@ static int mxt_load_fw(struct device *dev) dev_info(dev, "Sent %d frames, %zd bytes\n", frame, pos); /* Wait for device to reset */ - ret = mxt_wait_for_completion(data, &data->bl_completion, - MXT_FW_RESET_TIME); - if (ret) - dev_err(dev, "Device didn't reset\n"); + mxt_wait_for_completion(data, &data->bl_completion, MXT_RESET_TIMEOUT); data->in_bootloader = false;