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

Next file: linux/drivers/char/README.stallion
Previous file: linux/arch/sparc64/vmlinux.lds
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.28/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -3924,10 +3924,12 @@
 	DPRINT("Read linux/drivers/block/README.fd\n");
 }
 
+static int have_no_fdc= -EIO;
+
 int floppy_init(void)
 {
 	int i,unit,drive;
-	int have_no_fdc= -EIO;
+
 
 	raw_cmd = 0;
 
@@ -4237,6 +4239,8 @@
 void floppy_eject(void)
 {
 	int dummy;
+	if(have_no_fdc)
+		return;
 	floppy_grab_irq_and_dma();
 	lock_fdc(MAXTIMEOUT,0);
 	dummy=fd_eject(0);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov