diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-05-31 14:48:15 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:38:12 +0100 |
| commit | a557272e807708efcdb13ba4d9a42527cf461b52 (patch) | |
| tree | 71c576c2851d91e0d0b86409b089536ad2e76f07 /drivers/hid | |
| parent | f2fd7720aacd702811dd6f863e801a76e97a8722 (diff) | |
| download | linux-stable-a557272e807708efcdb13ba4d9a42527cf461b52.tar.gz linux-stable-a557272e807708efcdb13ba4d9a42527cf461b52.tar.bz2 linux-stable-a557272e807708efcdb13ba4d9a42527cf461b52.zip | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-elo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c index 4e49462870ab..d0c8a1c1e1fe 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); } |