tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
ch9344: fix build on Linux 6.3
MakiseKurisu
2 years ago
9e7fbfba
58b1a946
+16
2 changed files
expand all
collapse all
unified
split
pkgs
os-specific
linux
ch9344
default.nix
fix-incompatible-pointer-types_6_3.patch
+3
pkgs/os-specific/linux/ch9344/default.nix
···
13
13
patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [
14
14
# https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1
15
15
./fix-incompatible-pointer-types.patch
16
16
+
] ++ lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.3") [
17
17
+
# https://github.com/torvalds/linux/commit/5d420399073770134d2b03e004b2c0201c7fa26f
18
18
+
./fix-incompatible-pointer-types_6_3.patch
16
19
];
17
20
18
21
sourceRoot = "${src.name}/driver";
+13
pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch
···
1
1
+
diff --git a/ch9344.c b/ch9344.c
2
2
+
index a16af82..8922ed9 100644
3
3
+
--- a/ch9344.c
4
4
+
+++ b/ch9344.c
5
5
+
@@ -774,7 +774,7 @@ static inline void *tty_get_portdata(struct ch9344_ttyport *port)
6
6
+
return (port->portdata);
7
7
+
}
8
8
+
9
9
+
-static void ch9344_port_dtr_rts(struct tty_port *port, int raise)
10
10
+
+static void ch9344_port_dtr_rts(struct tty_port *port, bool raise)
11
11
+
{
12
12
+
struct ch9344_ttyport *ttyport = container_of(port, struct ch9344_ttyport, port);
13
13
+
struct ch9344 *ch9344 = tty_get_portdata(ttyport);