patch-2.4.0-test3 linux/drivers/cdrom/cdu31a.c

• Lines: 25
• Date: Thu Jul 6 19:25:21 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/cdu31a.c
• Orig date: Wed Feb 16 17:03:51 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/cdu31a.c linux/drivers/cdrom/cdu31a.c
@@ -3245,6 +3245,7 @@
   &scd_dops,                  /* device operations */
   NULL,                       /* link */
   NULL,                       /* handle */
+  0,			      /* devfs */
   0,			      /* dev */
   0,                          /* mask */
   2,                          /* maximum speed */
@@ -3544,6 +3545,7 @@
    }
 errout0:
    printk("Unable to register CDU-31a with Uniform cdrom driver\n");
+   blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
    if (devfs_unregister_blkdev(MAJOR_NR, "cdu31a"))    
    {
       printk("Can't unregister block device for cdu31a\n");
@@ -3568,6 +3570,8 @@
       printk("Can't unregister cdu31a\n");
       return;
    }
+
+   blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 
    if (cdu31a_irq > 0)
       free_irq(cdu31a_irq, NULL);