From 05f50406a3f24e59031e9772f9428b1d8ce99e00 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:20:58 -0800
Subject: [PATCH] --- yaml --- r: 187139 b: refs/heads/master c:
 c529730a98874fa951995d8a312c7fd606832eda h: refs/heads/master i:   187137:
 23cdca6c8c9b74275fd947706987f74b2c56bfa3   187135:
 4abfb741a610b6be63cec9a76d5805bb8a9c8e21 v: v3

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

diff --git a/[refs] b/[refs]
index b2d1ab6c4adc..040bb8d7029f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74f63f469ed1cee8305840b7bbcee2f99797cd12
+refs/heads/master: c529730a98874fa951995d8a312c7fd606832eda
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 028d7e4749d0..94c7abc5e291 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -639,8 +639,8 @@ static const char *timeout_message;
 static void is_alive(const char *message)
 {
 	/* this routine checks whether the floppy driver is "alive" */
-	if (test_bit(0, &fdc_busy) && command_status < 2
-	    && !timer_pending(&fd_timeout)) {
+	if (test_bit(0, &fdc_busy) && command_status < 2 &&
+	    !timer_pending(&fd_timeout)) {
 		DPRINT("timeout handler died: %s\n", message);
 	}
 }
@@ -1769,8 +1769,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
 			if (do_print)
 				print_result("sensei", inr);
 			max_sensei--;
-		} while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2
-			 && max_sensei);
+		} while ((ST0 & 0x83) != UNIT(current_drive) &&
+			 inr == 2 && max_sensei);
 	}
 	if (!handler) {
 		FDCS->reset = 1;