From 680f7f35826c6513022c48e1078d706484e79206 Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Fri, 19 Feb 2021 13:06:50 +0530 Subject: [PATCH] input: touchscreen: nt36xxx: Cancel pending firmware update Before initiating trusted touch, cancel pending firmware update. Change-Id: Ied0973e891fce10ec52135882bfb9fde220af8e7 Signed-off-by: Ritesh Kumar --- drivers/input/touchscreen/nt36xxx/nt36xxx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx.c b/drivers/input/touchscreen/nt36xxx/nt36xxx.c index b8c0e6c99ae1..7670528c2e38 100644 --- a/drivers/input/touchscreen/nt36xxx/nt36xxx.c +++ b/drivers/input/touchscreen/nt36xxx/nt36xxx.c @@ -976,6 +976,11 @@ static int nvt_ts_trusted_touch_pvm_vm_mode_enable(struct nvt_ts_data *ts) struct trusted_touch_vm_info *vm_info = ts->vm_info; atomic_set(&ts->trusted_touch_underway, 1); + +#if BOOT_UPDATE_FIRMWARE + if (nvt_fwu_wq) + cancel_delayed_work_sync(&ts->nvt_fwu_work); +#endif /* i2c session start and resource acquire */ if (nvt_ts_bus_get(ts) < 0) { pr_err("nvt_ts_bus_get failed\n");