aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et131x.c
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2014-09-14 16:59:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 16:05:20 -0700
commitcec78b98df2f87a396890c802dccbf0e604c6829 (patch)
treee05b243f739774e049c2d43e5d939abe25246929 /drivers/staging/et131x/et131x.c
parentstaging: et131x: Fix 'else is not generally useful after a break or return' (diff)
downloadlinux-dev-cec78b98df2f87a396890c802dccbf0e604c6829.tar.xz
linux-dev-cec78b98df2f87a396890c802dccbf0e604c6829.zip
staging: et131x: logical continuations should be on the previous line
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>
Diffstat (limited to 'drivers/staging/et131x/et131x.c')
-rw-r--r--drivers/staging/et131x/et131x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index df31fee965e0..eefa9f1cf580 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -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)