aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-10 18:20:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 18:52:30 -0500
commitc529730a98874fa951995d8a312c7fd606832eda (patch)
tree1098a8037fb30b73e672d69b8f6a9cfe4e6387aa /drivers/block/floppy.c
parent74f63f469ed1cee8305840b7bbcee2f99797cd12 (diff)
drivers/block/floppy.c: move leading && and || to preceding line
Signed-off-by: Joe Perches <joe@perches.com> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 028d7e4749d0..94c7abc5e291 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -639,8 +639,8 @@ static const char *timeout_message;
639static void is_alive(const char *message) 639static void is_alive(const char *message)
640{ 640{
641 /* this routine checks whether the floppy driver is "alive" */ 641 /* this routine checks whether the floppy driver is "alive" */
642 if (test_bit(0, &fdc_busy) && command_status < 2 642 if (test_bit(0, &fdc_busy) && command_status < 2 &&
643 && !timer_pending(&fd_timeout)) { 643 !timer_pending(&fd_timeout)) {
644 DPRINT("timeout handler died: %s\n", message); 644 DPRINT("timeout handler died: %s\n", message);
645 } 645 }
646} 646}
@@ -1769,8 +1769,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
1769 if (do_print) 1769 if (do_print)
1770 print_result("sensei", inr); 1770 print_result("sensei", inr);
1771 max_sensei--; 1771 max_sensei--;
1772 } while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2 1772 } while ((ST0 & 0x83) != UNIT(current_drive) &&
1773 && max_sensei); 1773 inr == 2 && max_sensei);
1774 } 1774 }
1775 if (!handler) { 1775 if (!handler) {
1776 FDCS->reset = 1; 1776 FDCS->reset = 1;