From 5496c6acf89933064828b6606c315374f6f64a16 Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Sun, 6 Mar 2022 22:17:26 +0100
Subject: [PATCH] xmm7360-pci: unstable-20210802 -> unstable-20220210

---
 pkgs/xmm7360-pci/default.nix |  8 +++-----
 pkgs/xmm7360-pci/fix.patch   | 22 ----------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/xmm7360-pci/fix.patch

diff --git a/pkgs/xmm7360-pci/default.nix b/pkgs/xmm7360-pci/default.nix
index 5e0336e..3ee171f 100644
--- a/pkgs/xmm7360-pci/default.nix
+++ b/pkgs/xmm7360-pci/default.nix
@@ -2,19 +2,17 @@
 
 kernel.stdenv.mkDerivation rec {
   pname = "xmm7360-pci";
-  version = "unstable-20210802";
+  version = "unstable-20220210";
 
   src = fetchFromGitHub {
     owner = "xmm7360";
     repo = pname;
-    rev = "b28714b6fb73887ecd5c0c25ffc0613d6eab6533";
-    sha256 = "sha256-wNSQZvPL297pTAVT9Hj4IgcsHSc7KVNe7K0raS0bObg=";
+    rev = "cf6625ace8da1bd44f46eb71b2557ac01ee1d11a";
+    sha256 = "sha256-IVrqFk/M6OZtI8v79DCtlHBBYdj95p6xI6dmsSua8ns=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  patches = [ ./fix.patch ];
-
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
diff --git a/pkgs/xmm7360-pci/fix.patch b/pkgs/xmm7360-pci/fix.patch
deleted file mode 100644
index a6946df..0000000
--- a/pkgs/xmm7360-pci/fix.patch
+++ /dev/null
@@ -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);