diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-25 18:31:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-25 18:30:59 -0700 |
| commit | 0861ec02ccd1a2a64273db26489ce845354f6498 (patch) | |
| tree | fe520e69e9ba85e6562a7d60faaf0e703a20c3c1 /drivers | |
| parent | 349ce036879a6d7f8f41450fa0fe5880eb8293fb (diff) | |
| parent | 1d60d26f9674c21c05ea2b31f038dc021a2f19ec (diff) | |
Merge "soc: qcom: Use a deferrable timer base for the msm watchdog"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/qcom/watchdog_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/watchdog_v2.c b/drivers/soc/qcom/watchdog_v2.c index 8f58eaa537b1..470ecfdd9f5e 100644 --- a/drivers/soc/qcom/watchdog_v2.c +++ b/drivers/soc/qcom/watchdog_v2.c @@ -701,7 +701,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; |