]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: et131x: logical continuations should be on the previous line
authorMark Einon <mark.einon@gmail.com>
Sun, 14 Sep 2014 15:59:05 +0000 (16:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2014 23:05:20 +0000 (16:05 -0700)
Fix two occurrences of the checkpatch check:

CHECK: Logical continuations should be on the previous line

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/et131x/et131x.c

index df31fee965e04a5aa8fdd76a28283080c52b867b..eefa9f1cf5806bbd7622fcd133f6b8f49d558356 100644 (file)
@@ -608,8 +608,8 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
                 * an error has occurred.Don't break here if we are revision
                 * 1, this is so we do a blind write for load bug.
                 */
-               if ((status & LBCIF_STATUS_GENERAL_ERROR)
-                       && adapter->pdev->revision == 0)
+               if ((status & LBCIF_STATUS_GENERAL_ERROR) &&
+                   adapter->pdev->revision == 0)
                        break;
 
                /* Check bit 2 of the LBCIF Status Register.  If equal to 1 an
@@ -2977,8 +2977,8 @@ static void et131x_handle_send_pkts(struct et131x_adapter *adapter)
                tcb = tx_ring->send_head;
        }
        while (tcb &&
-              !((serviced ^ tcb->index) & ET_DMA10_WRAP)
-              && index > (tcb->index & ET_DMA10_MASK)) {
+              !((serviced ^ tcb->index) & ET_DMA10_WRAP) &&
+              index > (tcb->index & ET_DMA10_MASK)) {
                tx_ring->used--;
                tx_ring->send_head = tcb->next;
                if (tcb->next == NULL)