提交 c529730a 编写于 作者: J Joe Perches 提交者: Linus Torvalds

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

Signed-off-by: NJoe 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 74f63f46
...@@ -639,8 +639,8 @@ static const char *timeout_message; ...@@ -639,8 +639,8 @@ static const char *timeout_message;
static void is_alive(const char *message) static void is_alive(const char *message)
{ {
/* this routine checks whether the floppy driver is "alive" */ /* this routine checks whether the floppy driver is "alive" */
if (test_bit(0, &fdc_busy) && command_status < 2 if (test_bit(0, &fdc_busy) && command_status < 2 &&
&& !timer_pending(&fd_timeout)) { !timer_pending(&fd_timeout)) {
DPRINT("timeout handler died: %s\n", message); DPRINT("timeout handler died: %s\n", message);
} }
} }
...@@ -1769,8 +1769,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id) ...@@ -1769,8 +1769,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
if (do_print) if (do_print)
print_result("sensei", inr); print_result("sensei", inr);
max_sensei--; max_sensei--;
} while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2 } while ((ST0 & 0x83) != UNIT(current_drive) &&
&& max_sensei); inr == 2 && max_sensei);
} }
if (!handler) { if (!handler) {
FDCS->reset = 1; FDCS->reset = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册