From 5ebb7fdebee04bd8a9c3a89f39416df6a5727d78 Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Tue, 12 Feb 2019 11:59:36 -0600 Subject: [PATCH] fixup! (CR) synaptics_mmi: firmware upgrade with older bootloader Original commit mistakenly took out a piece of interrupt handling procedure. Getting this issue fixed Mot-CRs-Fixed: (CR) Signed-off-by: Konstantin Makariev Change-Id: Icf41f2497b5b470d81713b5f9e1b25e68e7a7611 Reviewed-on: https://gerrit.mot.com/1307876 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Tiago Ganselli Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- .../synaptics_mmi/synaptics_dsx_fw_update.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_fw_update.c b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_fw_update.c index e91fcb9465b6..e76c130fe16d 100644 --- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_fw_update.c +++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_fw_update.c @@ -905,14 +905,12 @@ static int fwu_wait_for_idle( { int retval; - if (fwu->bl_version > BL_V6) { - retval = down_timeout(&fwu->irq_sema, msecs_to_jiffies(timeout_ms)); - if (retval) { - retval = -ETIMEDOUT; - dev_err(LOGDEV, + retval = down_timeout(&fwu->irq_sema, msecs_to_jiffies(timeout_ms)); + if (retval) { + retval = -ETIMEDOUT; + dev_err(LOGDEV, "%s: timed out waiting for cmd to complete\n", __func__); - } } retval = fwu_read_interrupt_status(fwu);