From 64c8b06377049e4faedf7048365d1ed94717e098 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 23 Nov 2017 17:44:16 +0100 Subject: [PATCH] dde_linux: fix mod_delayed_work(delay) 'delay' is a relative timeout while mod_timer() needs an absolute point in time. --- repos/dde_linux/src/lib/lxip/lxcc_emul.cc | 2 +- repos/dde_linux/src/lib/wifi/lxcc_emul.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/dde_linux/src/lib/lxip/lxcc_emul.cc b/repos/dde_linux/src/lib/lxip/lxcc_emul.cc index e4a27bf8a3..36ec1a60a1 100644 --- a/repos/dde_linux/src/lib/lxip/lxcc_emul.cc +++ b/repos/dde_linux/src/lib/lxip/lxcc_emul.cc @@ -702,7 +702,7 @@ bool mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork, setup_timer(&dwork->timer, execute_delayed_work, (unsigned long)dwork); } - mod_timer(&dwork->timer, delay); + mod_timer(&dwork->timer, jiffies + delay); } return true; } diff --git a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc index fb670ded05..2c2989ca17 100644 --- a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc +++ b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc @@ -1437,7 +1437,7 @@ bool mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork, if (delay == 0) { execute_delayed_work((unsigned long)dwork); } else { - mod_timer(&dwork->timer, delay); + mod_timer(&dwork->timer, jiffies + delay); } return true; }