patch-2.4.0-test3 linux/drivers/block/cpqarray.c

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

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/block/cpqarray.c linux/drivers/block/cpqarray.c
@@ -169,7 +169,7 @@
 #else
 static void ida_procinit(int i) {}
 static int ida_proc_get_info(char *buffer, char **start, off_t offset,
-			     int length, int *eof, void *data) {}
+			     int length, int *eof, void *data) { return 0;}
 #endif
 
 static void ida_geninit(int ctlr)
@@ -331,6 +331,7 @@
 		iounmap((void*)hba[i]->vaddr);
 		unregister_blkdev(MAJOR_NR+i, hba[i]->devname);
 		del_timer(&hba[i]->timer);
+		blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR + i));
 		remove_proc_entry(hba[i]->devname, proc_array);
 		kfree(hba[i]->cmd_pool);
 		kfree(hba[i]->cmd_pool_bits);