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

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

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/mcdx.c linux/drivers/cdrom/mcdx.c
@@ -297,6 +297,7 @@
   &mcdx_dops,                    /* device operations */
   NULL,                         /* link */
   NULL,                         /* handle */
+  0,				/* de, devfs */
   0,		                /* dev */
   0,                            /* mask */
   2,                            /* maximum speed */
@@ -1016,6 +1017,7 @@
     if (devfs_unregister_blkdev(MAJOR_NR, "mcdx") != 0) {
         xwarn("cleanup() unregister_blkdev() failed\n");
     }
+	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 #if !MCDX_QUIET
 	else xinfo("cleanup() succeeded\n");
 #endif
@@ -1143,6 +1145,7 @@
 		      MCDX,
 		      stuffp->wreg_data, stuffp->irq, stuffp->irq);
 		stuffp->irq = 0;
+		blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 		kfree(stuffp);
 		return 0;
 	}
@@ -1184,6 +1187,7 @@
 		kfree(stuffp);
 		if (devfs_unregister_blkdev(MAJOR_NR, "mcdx") != 0)
         		xwarn("cleanup() unregister_blkdev() failed\n");
+		blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 		return 2;
         }
         printk(msg);