patch-2.1.71 linux/drivers/block/floppy.c

• Lines: 16
• Date: Tue Dec 2 22:19:33 1997
• Orig file: v2.1.70/linux/drivers/block/floppy.c
• Orig date: Mon Dec 1 12:04:11 1997

diff -u --recursive --new-file v2.1.70/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -3975,6 +3975,7 @@
 	fdc_state[0].address = FDC1;
 	if (fdc_state[0].address == -1) {
 		unregister_blkdev(MAJOR_NR,"fd");
+		del_timer(&fd_timeout);
 		return -ENODEV;
 	}
 #if N_FDC > 1
@@ -3983,6 +3984,7 @@
 
 	if (floppy_grab_irq_and_dma()){
 		unregister_blkdev(MAJOR_NR,"fd");
+		del_timer(&fd_timeout);
 		return -EBUSY;
 	}