From 9e7fbfbaff750d12bc89e6c193bcdbdd1c266a27 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Thu, 11 May 2023 22:25:07 +0800 Subject: [PATCH] ch9344: fix build on Linux 6.3 --- pkgs/os-specific/linux/ch9344/default.nix | 3 +++ .../ch9344/fix-incompatible-pointer-types_6_3.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix index 25d7ecf02552..8f258d227bb1 100644 --- a/pkgs/os-specific/linux/ch9344/default.nix +++ b/pkgs/os-specific/linux/ch9344/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [ # https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1 ./fix-incompatible-pointer-types.patch + ] ++ lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.3") [ + # https://github.com/torvalds/linux/commit/5d420399073770134d2b03e004b2c0201c7fa26f + ./fix-incompatible-pointer-types_6_3.patch ]; sourceRoot = "${src.name}/driver"; diff --git a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch new file mode 100644 index 000000000000..b4cf265daac9 --- /dev/null +++ b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch @@ -0,0 +1,13 @@ +diff --git a/ch9344.c b/ch9344.c +index a16af82..8922ed9 100644 +--- a/ch9344.c ++++ b/ch9344.c +@@ -774,7 +774,7 @@ static inline void *tty_get_portdata(struct ch9344_ttyport *port) + return (port->portdata); + } + +-static void ch9344_port_dtr_rts(struct tty_port *port, int raise) ++static void ch9344_port_dtr_rts(struct tty_port *port, bool raise) + { + struct ch9344_ttyport *ttyport = container_of(port, struct ch9344_ttyport, port); + struct ch9344 *ch9344 = tty_get_portdata(ttyport);