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

• Lines: 17
• Date: Thu Jul 6 19:25:21 2000
• Orig file: v2.4.0-test2/linux/drivers/block/ps2esdi.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/block/ps2esdi.c linux/drivers/block/ps2esdi.c
@@ -121,7 +121,7 @@
 static int ps2esdi_drives = 0;
 static struct hd_struct ps2esdi[MAX_HD << 6];
 static u_short io_base;
-static struct timer_list esdi_timer = {NULL, NULL, 0, 0L, ps2esdi_reset_timer};
+static struct timer_list esdi_timer = {{NULL, NULL}, 0, 0L, ps2esdi_reset_timer};
 static int reset_status;
 static int ps2esdi_slot = -1;
 int tp720esdi = 0;		/* Is it Integrated ESDI of ThinkPad-720? */
@@ -232,6 +232,7 @@
 	free_dma(dma_arb_level);
   	free_irq(PS2ESDI_IRQ, NULL)
 	devfs_unregister_blkdev(MAJOR_NR, "ed");
+	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 }
 #endif /* MODULE */