lkml.org 
[lkml]   [2010]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/24] drivers/block/floppy.c: Move leading && and || to preceding line
    Date
    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/block/floppy.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index ab62fa8..5e3286d 100644
    --- a/drivers/block/floppy.c
    +++ b/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;
    --
    1.6.6.rc0.57.gad7a


    \
     
     \ /
      Last update: 2010-01-22 05:59    [W:0.022 / U:2.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site