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

Commit e447f091 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Use a deferrable timer base for the msm watchdog"

parents c92f19d6 bccd8899

drivers/soc/qcom/watchdog_v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -683,7 +683,7 @@ static void init_watchdog_data(struct msm_watchdog_data *wdog_dd) 
	wdog_dd->user_pet_complete = true;

	wdog_dd->user_pet_enabled = false;

	wake_up_process(wdog_dd->watchdog_task);

	init_timer(&wdog_dd->pet_timer);

	init_timer_deferrable(&wdog_dd->pet_timer);

	wdog_dd->pet_timer.data = (unsigned long)wdog_dd;

	wdog_dd->pet_timer.function = pet_task_wakeup;

	wdog_dd->pet_timer.expires = jiffies + delay_time;