Unverified Commit b3ae81a3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1749 Input: cyttsp4_core - change del_timer_sync() to timer_shutdown_sync() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Jihong <yangjihong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TUHOROYESBXPQZYAJ6NRZKRHEBFESGHK/ 
 
https://gitee.com/src-openeuler/kernel/issues/I7QE3F 
 
Link:https://gitee.com/openeuler/kernel/pulls/1749

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ed1a8519 717e1ea8

drivers/input/touchscreen/cyttsp4_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1249,9 +1249,8 @@ static void cyttsp4_stop_wd_timer(struct cyttsp4 *cd) 
	 * Ensure we wait until the watchdog timer

	 * running on a different CPU finishes

	 */

	del_timer_sync(&cd->watchdog_timer);

	timer_shutdown_sync(&cd->watchdog_timer);

	cancel_work_sync(&cd->watchdog_work);

	del_timer_sync(&cd->watchdog_timer);

}



static void cyttsp4_watchdog_timer(struct timer_list *t)