diff options
| author | Dmitry Torokhov <[email protected]> | 2025-06-02 04:41:07 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2025-06-02 04:41:07 +0000 |
| commit | 4f9786035f9e519db41375818e1d0b5f20da2f10 (patch) | |
| tree | b307ecc9ab55c44ace462e59549c6d7976da5bfd /drivers/tty/serial/sccnxp.c | |
| parent | Input: synaptics-rmi - fix crash with unsupported versions of F34 (diff) | |
| parent | Input: ims-pcu - check record size in ims_pcu_flash_firmware() (diff) | |
| download | kernel-4f9786035f9e519db41375818e1d0b5f20da2f10.tar.gz kernel-4f9786035f9e519db41375818e1d0b5f20da2f10.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.16 merge window.
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index 4c851dae6624..553e3c1321ca 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -1033,7 +1033,7 @@ static void sccnxp_remove(struct platform_device *pdev) if (!s->poll) devm_free_irq(&pdev->dev, s->irq, s); else - del_timer_sync(&s->timer); + timer_delete_sync(&s->timer); for (i = 0; i < s->uart.nr; i++) uart_remove_one_port(&s->uart, &s->port[i]); |