Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c529730a authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

drivers/block/floppy.c: move leading && and || to preceding line 



Signed-off-by: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 74f63f46

drivers/block/floppy.c

+4 −4
Original line number Diff line number Diff line
@@ -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;