Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a854b494 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: nt36xxx: Cancel pending firmware update"

parents 71e82255 680f7f35

drivers/input/touchscreen/nt36xxx/nt36xxx.c

+5 −0
Original line number Diff line number Diff line
@@ -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");