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

• Lines: 24
• Date: Thu Jul 6 19:25:21 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/aztcd.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/aztcd.c linux/drivers/cdrom/aztcd.c
@@ -310,7 +310,7 @@
 
 static int AztTimeout, AztTries;
 static DECLARE_WAIT_QUEUE_HEAD(azt_waitq);
-static struct timer_list delay_timer = { NULL, NULL, 0, 0, NULL };
+static struct timer_list delay_timer = { {NULL, NULL}, 0, 0, NULL };
 
 static struct azt_DiskInfo DiskInfo;
 static struct azt_Toc Toc[MAX_TRACKS];
@@ -1819,12 +1819,13 @@
 
 void __exit aztcd_exit(void)
 {
-  devfs_unregister(devfs_find_handle(NULL, "aztcd", 0, 0, 0, DEVFS_SPECIAL_BLK,
+  devfs_unregister(devfs_find_handle(NULL, "aztcd", 0, 0, DEVFS_SPECIAL_BLK,
 				     0));
   if ((devfs_unregister_blkdev(MAJOR_NR, "aztcd") == -EINVAL))    
     { printk("What's that: can't unregister aztcd\n");
       return;
     }
+  blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
   if ((azt_port==0x1f0)||(azt_port==0x170))  
     { SWITCH_IDE_MASTER;
       release_region(azt_port,8);  /*IDE-interface*/