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

• Lines: 22
• Date: Wed Jul 5 13:15:19 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/sjcd.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/sjcd.c linux/drivers/cdrom/sjcd.c
@@ -1577,8 +1577,10 @@
 {
   if( (devfs_unregister_blkdev(MAJOR_NR, "sjcd") == -EINVAL) )
     printk( "SJCD: cannot unregister device.\n" );
-  else
+  else {
     release_region( sjcd_base, 4 );
+    blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
+  }
 
   return(0);
 }
@@ -1586,8 +1588,7 @@
 
 void __exit sjcd_exit(void)
 {
-  devfs_unregister(devfs_find_handle(NULL, "sjcd", 0, 0, 0, DEVFS_SPECIAL_BLK,
-				     0));
+  devfs_unregister(devfs_find_handle(NULL, "sjcd", 0, 0, DEVFS_SPECIAL_BLK,0));
   if ( sjcd_cleanup() )
     printk( "SJCD: module: cannot be removed.\n" );
   else