diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 15:32:49 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 15:32:49 +0300 |
| commit | 0869331fbaa2c11c9e94e45305d17ce447189a0a (patch) | |
| tree | ceb7a26a3f39146dcf9bec3667ff19169bd5026b /drivers/nfc/pn533/pn533.c | |
| parent | e0e14cdff31d326f81e0edbd5140f788c870756c (diff) | |
| parent | 4b0986a3613c92f4ec1bdc7f60ec66fea135991f (diff) | |
| download | linux-0869331fbaa2c11c9e94e45305d17ce447189a0a.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To get the rest of 5.18.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/nfc/pn533/pn533.c')
| -rw-r--r-- | drivers/nfc/pn533/pn533.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index a491db46e3bd..d9f6367b9993 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2787,13 +2787,14 @@ void pn53x_common_clean(struct pn533 *priv) { struct pn533_cmd *cmd, *n; + /* delete the timer before cleanup the worker */ + del_timer_sync(&priv->listen_timer); + flush_delayed_work(&priv->poll_work); destroy_workqueue(priv->wq); skb_queue_purge(&priv->resp_q); - del_timer(&priv->listen_timer); - list_for_each_entry_safe(cmd, n, &priv->cmd_queue, queue) { list_del(&cmd->queue); kfree(cmd); |