tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / os-specific / linux / ch9344 / fix-linux-6-15-build.patch
at devShellTools-shell 16 lines 510 B view raw
1diff --git a/ch9344.c b/ch9344.c 2index 36402c0..cb3efc2 100644 3--- a/ch9344.c 4+++ b/ch9344.c 5@@ -1251,7 +1251,11 @@ static void ch9344_port_shutdown(struct tty_port *port) 6 struct ch9344 *ch9344 = tty_get_portdata(ttyport); 7 int portnum = ttyport->portnum; 8 9+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) 10+ timer_delete(&ttyport->timer); 11+#else 12 del_timer(&ttyport->timer); 13+#endif 14 ch9344_set_control(ch9344, portnum, 0x00); 15 ch9344_set_control(ch9344, portnum, 0x10); 16 ttyport->isopen = false;