diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-05-31 14:48:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-06-01 14:08:17 +0200 |
| commit | ed596a4a88bd161f868ccba078557ee7ede8a6ef (patch) | |
| tree | 83df401acef2219a644a9ff158d27977a527ab46 /drivers/hid/hid-elo.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| download | linux-ed596a4a88bd161f868ccba078557ee7ede8a6ef.tar.xz linux-ed596a4a88bd161f868ccba078557ee7ede8a6ef.zip | |
HID: elo: kill not flush the work
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>
Diffstat (limited to 'drivers/hid/hid-elo.c')
| -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 aad8c162a825..0cd4f7216239 100644 --- a/drivers/hid/hid-elo.c +++ b/drivers/hid/hid-elo.c @@ -261,7 +261,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); } |