From b33e8a52b1be70dfdd14c712affb174e00b9da45 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:20:47 -0800
Subject: [PATCH] --- yaml --- r: 187124 b: refs/heads/master c:
 045f98363080ddbbcef6b8b8306ec58a818406a0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7692249cb697..156b5cef179b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a81ee5447157a4b9930bab8ec70cf77a55db64e8
+refs/heads/master: 045f98363080ddbbcef6b8b8306ec58a818406a0
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 3072003d81ca..88a741c75110 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -575,7 +575,6 @@ static void floppy_release_irq_and_dma(void);
  * reset doesn't need to be tested before sending commands, because
  * output_byte is automatically disabled when reset is set.
  */
-#define CHECK_RESET { if (FDCS->reset){ reset_fdc(); return; } }
 static void reset_fdc(void);
 
 /*
@@ -1958,7 +1957,10 @@ static int start_motor(void (*function)(void))
 
 static void floppy_ready(void)
 {
-	CHECK_RESET;
+	if (FDCS->reset) {
+		reset_fdc();
+		return;
+	}
 	if (start_motor(floppy_ready))
 		return;
 	if (fdc_dtr())