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

Next file: linux/drivers/block/genhd.c
Previous file: linux/drivers/block/cm206.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.21/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -908,7 +908,7 @@
 	} else {		
 		del_timer(&fd_timer);
 		fd_timer.function = (timeout_fn) fd_watchdog;
-		fd_timer.expires = jiffies + 10;
+		fd_timer.expires = jiffies + HZ / 10;
 		add_timer(&fd_timer);
 	}
 }
@@ -1031,7 +1031,7 @@
 static int output_byte(char byte)
 {
 	int counter;
-	unsigned char status;
+	unsigned char status = 0;	/* keep gcc quiet */
 	unsigned char rstatus;
 
 	if (FDCS->reset)
@@ -1065,7 +1065,7 @@
 /* gets the response from the fdc */
 static int result(void)
 {
-	int i = 0, counter, status;
+	int i = 0, counter, status = 0;
 
 	if (FDCS->reset)
 		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