Merge with Linux 2.4.0-test5-pre3.

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 60e6ac44f..e83509c8e 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2339,6 +2339,13 @@ static void rw_interrupt(void)
 {
 	int nr_sectors, ssize, eoc, heads;
 
+	if (R_HEAD >= 2) {
+	    /* some Toshiba floppy controllers occasionnally seem to
+	     * return bogus interrupts after read/write operations, which
+	     * can be recognized by a bad head number (>= 2) */
+	     return;
+	}  
+
 	if (!DRS->first_read_date)
 		DRS->first_read_date = jiffies;