646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
17 lines
510 B
Diff
17 lines
510 B
Diff
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;
|