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

Next file: linux/drivers/block/ide.c
Previous file: linux/arch/i386/kernel/time.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.29/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -2034,7 +2034,7 @@
 	head_shift  = (F_SECT_PER_TRACK + 5) / 6;
 
 	/* a ``cylinder'' is two tracks plus a little stepping time */
-	track_shift = 2 * head_shift + 1;
+	track_shift = 2 * head_shift + 3;
 
 	/* position of logical sector 1 on this track */
 	n = (track_shift * format_req.track + head_shift * format_req.head )
@@ -3699,7 +3699,8 @@
 	}
 	set_dor(0, ~0, 8);  /* avoid immediate interrupt */
 
-	if (request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, "floppy")) {
+	if (request_irq(FLOPPY_IRQ, floppy_interrupt,
+			SA_INTERRUPT|SA_SAMPLE_RANDOM, "floppy")) {
 		DPRINT1("Unable to grab IRQ%d for the floppy driver\n",
 			FLOPPY_IRQ);
 		return -1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this