diff options
| author | Wolfram Sang <wsa@kernel.org> | 2022-09-16 20:42:18 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-16 20:42:18 +0100 |
| commit | d819524d3144f4703f45f473fdc85ad7579ae94c (patch) | |
| tree | 9bcb29b9b1a24ecf5a1a367c1af7d9be138ba041 /drivers/nfc | |
| parent | 859d64685d6c868db62b86064769b053db8bf834 (diff) | |
| parent | 80e78fcce86de0288793a0ef0f6acf37656ee4cf (diff) | |
| download | linux-stable-d819524d3144f4703f45f473fdc85ad7579ae94c.tar.gz linux-stable-d819524d3144f4703f45f473fdc85ad7579ae94c.tar.bz2 linux-stable-d819524d3144f4703f45f473fdc85ad7579ae94c.zip | |
Merge tag 'v6.0-rc5' into i2c/for-mergewindow
Linux 6.0-rc5
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/pn533/uart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c index 2caf997f9bc9..07596bf5f7d6 100644 --- a/drivers/nfc/pn533/uart.c +++ b/drivers/nfc/pn533/uart.c @@ -310,6 +310,7 @@ static void pn532_uart_remove(struct serdev_device *serdev) pn53x_unregister_nfc(pn532->priv); serdev_device_close(serdev); pn53x_common_clean(pn532->priv); + del_timer_sync(&pn532->cmd_timeout); kfree_skb(pn532->recv_skb); kfree(pn532); } |