Files
nixpkgs/pkgs/os-specific/linux/ch9344/fix-linux-6-15-build.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

17 lines
510 B
Diff
Raw Permalink Normal View History

2025-10-09 14:15:47 +02:00
diff --git a/ch9344.c b/ch9344.c
index 36402c0..cb3efc2 100644
--- a/ch9344.c
+++ b/ch9344.c
@@ -1251,7 +1251,11 @@ static void ch9344_port_shutdown(struct tty_port *port)
struct ch9344 *ch9344 = tty_get_portdata(ttyport);
int portnum = ttyport->portnum;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0))
+ timer_delete(&ttyport->timer);
+#else
del_timer(&ttyport->timer);
+#endif
ch9344_set_control(ch9344, portnum, 0x00);
ch9344_set_control(ch9344, portnum, 0x10);
ttyport->isopen = false;