summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2016-05-31 14:48:15 +0200
committerJiri Slaby <jslaby@suse.cz>2016-07-21 08:36:11 +0200
commit5925ce0a3bd02a3c6c3d1d2fc7deb6ac89684beb (patch)
tree7ce498d0a36aaf7e6a972e664cf5bf76dcd10382
parent9deea4ddcc8f6b9708075aa307042c43b4fde732 (diff)
HID: elo: kill not flush the work
commit ed596a4a88bd161f868ccba078557ee7ede8a6ef upstream. 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. 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: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/hid/hid-elo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index 55e4920f967b..0cd5f767d861 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);
}