[added to the 4.1 stable tree] HID: elo: kill not flush the work
From: Sasha Levin <hidden>
Date: 2016-07-12 02:57:35
Subsystem:
hid core layer, the rest · Maintainers:
Jiri Kosina, Benjamin Tissoires, Linus Torvalds
From: Oliver Neukum <oneukum@suse.com> This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =============== [ Upstream commit ed596a4a88bd161f868ccba078557ee7ede8a6ef ] Flushing a work that reschedules itself is not a sensible operation. It needs to be killed. Failure to do so leads to a kernel panic in the timer code. CC: stable@vger.kernel.org Signed-off-by: Oliver Neukum <ONeukum@suse.com> Reviewed-by: Benjamin Tissoires <redacted> Signed-off-by: Jiri Kosina <redacted> Signed-off-by: Sasha Levin <redacted> --- drivers/hid/hid-elo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index 4e49462..d0c8a1c 100644
--- a/drivers/hid/hid-elo.c
+++ b/drivers/hid/hid-elo.c@@ -259,7 +259,7 @@ static void elo_remove(struct hid_device *hdev) struct elo_priv *priv = hid_get_drvdata(hdev); hid_hw_stop(hdev); - flush_workqueue(wq); + cancel_delayed_work_sync(&priv->work); kfree(priv); }
--
2.5.0