xmm7360-pci: unstable-20210802 -> unstable-20220210

21.11
Andreas Wiese 2022-03-06 22:17:26 +01:00
parent 41ce21aae4
commit 5496c6acf8
2 changed files with 3 additions and 27 deletions

View File

@ -2,19 +2,17 @@
kernel.stdenv.mkDerivation rec { kernel.stdenv.mkDerivation rec {
pname = "xmm7360-pci"; pname = "xmm7360-pci";
version = "unstable-20210802"; version = "unstable-20220210";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmm7360"; owner = "xmm7360";
repo = pname; repo = pname;
rev = "b28714b6fb73887ecd5c0c25ffc0613d6eab6533"; rev = "cf6625ace8da1bd44f46eb71b2557ac01ee1d11a";
sha256 = "sha256-wNSQZvPL297pTAVT9Hj4IgcsHSc7KVNe7K0raS0bObg="; sha256 = "sha256-IVrqFk/M6OZtI8v79DCtlHBBYdj95p6xI6dmsSua8ns=";
}; };
nativeBuildInputs = kernel.moduleBuildDependencies; nativeBuildInputs = kernel.moduleBuildDependencies;
patches = [ ./fix.patch ];
makeFlags = [ makeFlags = [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]; ];

View File

@ -1,22 +0,0 @@
diff --git a/xmm7360.c b/xmm7360.c
index ccd149d..5a4dc74 100644
--- a/xmm7360.c
+++ b/xmm7360.c
@@ -1272,7 +1272,7 @@ static int xmm7360_tty_write(struct tty_struct *tty,
return written;
}
-static int xmm7360_tty_write_room(struct tty_struct *tty)
+static unsigned int xmm7360_tty_write_room(struct tty_struct *tty)
{
struct queue_pair *qp = tty->driver_data;
if (!xmm7360_qp_can_write(qp))
@@ -1555,7 +1555,7 @@ static void xmm7360_exit(void)
pci_unregister_driver(&xmm7360_driver);
unregister_chrdev_region(xmm_base, 8);
tty_unregister_driver(xmm7360_tty_driver);
- put_tty_driver(xmm7360_tty_driver);
+ tty_driver_kref_put(xmm7360_tty_driver);
}
module_init(xmm7360_init);