patch-2.1.88 linux/include/asm-i386/floppy.h

• Lines: 30
• Date: Fri Feb 20 19:12:50 1998
• Orig file: v2.1.87/linux/include/asm-i386/floppy.h
• Orig date: Fri Feb 6 15:33:06 1998

diff -u --recursive --new-file v2.1.87/linux/include/asm-i386/floppy.h linux/include/asm-i386/floppy.h
@@ -60,7 +60,7 @@
 	register unsigned char st;
 
 #undef TRACE_FLPY_INT
-#undef NO_FLOPPY_ASSEMBLER
+#define NO_FLOPPY_ASSEMBLER
 
 #ifdef TRACE_FLPY_INT
 	static int calls=0;
@@ -123,10 +123,10 @@
 				outb_p(*lptr, virtual_dma_port+5);
 			else
 				*lptr = inb_p(virtual_dma_port+5);
-			st = inb(virtual_dma_port+4);
 		}
 		virtual_dma_count = lcount;
 		virtual_dma_addr = lptr;
+		st = inb(virtual_dma_port+4);
 	}
 #endif
 
@@ -223,7 +223,7 @@
 		   _CROSS_64KB(addr, size, 0))
 			use_virtual_dma = 1;
 		else
-			use_virtual_dma = 1;
+			use_virtual_dma = 0;
 	} else {
 		use_virtual_dma = can_use_virtual_dma & 1;
 	}