diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-05-31 14:48:15 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 20:19:52 -0400 |
| commit | b71d1794461e3be4e193b76a04132ac55afd5ae1 (patch) | |
| tree | 719cf7ed679197f49b48fdcb0bac66729f28bb6a /drivers/hid | |
| parent | 1aaee5de33d2b615b35afd77cdc6002da8919f0d (diff) | |
HID: elo: kill not flush the work
[ 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>
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); } |