From 468377b4f23dfe6b900244f339b31fdb03d28ad2 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:20:49 -0800
Subject: [PATCH] --- yaml --- r: 187126 b: refs/heads/master c:
 2300f90e31178f44b0e903c12ea311df1297d7fa h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/block/floppy.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e33b6d74e2f..eb003d021bfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7b2b2ecd88d06ae212d069a4e187ab690b1636f
+refs/heads/master: 2300f90e31178f44b0e903c12ea311df1297d7fa
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 7d1cd21a0ebc..7c0c7d09e089 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -1198,8 +1198,6 @@ static int output_byte(char byte)
 	return -1;
 }
 
-#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}
-
 /* gets the response from the fdc */
 static int result(void)
 {
@@ -1679,7 +1677,10 @@ static void seek_floppy(void)
 	do_floppy = seek_interrupt;
 	output_byte(FD_SEEK);
 	output_byte(UNIT(current_drive));
-	LAST_OUT(track);
+	if (output_byte(track) < 0) {
+		reset_fdc();
+		return;
+	}
 	debugt("seek command:");
 }
 
@@ -1809,7 +1810,10 @@ static void recalibrate_floppy(void)
 	debugt("recalibrate floppy:");
 	do_floppy = recal_interrupt;
 	output_byte(FD_RECALIBRATE);
-	LAST_OUT(UNIT(current_drive));
+	if (output_byte(UNIT(current_drive)) < 0) {
+		reset_fdc();
+		return;
+	}
 }
 
 /*