From f59b24ae116fa284ab4f6c8d6b288f01370f88dc Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Mon, 12 Dec 2022 21:32:27 +0100
Subject: [PATCH] Fix driver for 5.19.12 & 6.0.0

---
 src/oscdriver/oscdriver.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/oscdriver/oscdriver.c b/src/oscdriver/oscdriver.c
index f2c14d9..a6242e3 100644
--- a/src/oscdriver/oscdriver.c
+++ b/src/oscdriver/oscdriver.c
@@ -1324,7 +1324,11 @@ static void unregister_data_drive(void)
   put_disk(data_device.gd);
   unregister_blkdev(data_major_num, data_device.device_name);
   data_major_num = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 12)
   blk_cleanup_queue(data_queue);
+#else
+  blk_mq_destroy_queue(data_queue);
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
   blk_mq_free_tag_set(&data_device.tag_set);
 #endif
@@ -1542,8 +1546,10 @@ static long process_ioctl(struct file *f, const unsigned cmd, const unsigned lon
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
       data_device.gd = alloc_disk(16);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 12)
       data_device.gd = __alloc_disk_node(data_queue, NUMA_NO_NODE, &hddsc_bio_compl_lkclass);
+#else
+      data_device.gd = blk_mq_alloc_disk_for_queue(data_queue, &hddsc_bio_compl_lkclass);
 #endif
       if (!data_device.gd)
       {
@@ -1560,7 +1566,17 @@ static long process_ioctl(struct file *f, const unsigned cmd, const unsigned lon
       data_device.gd->private_data = &data_device;
       strcpy(data_device.gd->disk_name, data_device.device_name);
       set_capacity(data_device.gd, (data_device.size / KERNEL_SECTOR_SIZE));
-      add_disk(data_device.gd);
+      if (add_disk(data_device.gd)) {
+        printk(KERN_WARNING "hddsuperdrive: unable to register disk\n");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
+        blk_cleanup_queue(data_device.gd->queue);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+        blk_cleanup_disk(data_device.gd);
+#else
+        put_disk(data_device.gd);
+#endif
+        goto out_unregister;
+      }
 
       data_drive_active = 0;
       write_ctrl_data(CTRL_DATA_DRIVE_ACTIVE, 0);
@@ -2022,4 +2038,4 @@ static void __exit exit_driver(void)
 }
 
 module_init(initialize_driver);
-module_exit(exit_driver);
\ No newline at end of file
+module_exit(exit_driver);