From: Oliver Neukum <oneukum@suse.com>
Date: Tue, 31 May 2016 12:48:15 +0000 (+0200)
Subject: HID: elo: kill not flush the work
X-Git-Tag: v4.1.12-92~15^2~122
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=391e14d04a626b0506ddb90311b5e1c496348acb;p=users%2Fjedix%2Flinux-maple.git

HID: elo: kill not flush the work

Orabug: 25308013

[ 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 <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit b71d1794461e3be4e193b76a04132ac55afd5ae1)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index 4e49462870abd..d0c8a1c1e1fe5 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);
 }