Unverified Commit 9a142a62 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #231303 from MakiseKurisu/ch9344_failure 

ch9344: fix build on Linux 6.3
parents 6948ef4d 9e7fbfba

pkgs/os-specific/linux/ch9344/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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);