summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Paracuellos <sergio.paracuellos@gmail.com>2016-11-18 18:58:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-19 14:24:23 +0100
commit95263c9556796d7c22d901066ceb3787e11dbce5 (patch)
treea8f5ef3a9a7ebffa4e3fafcb39112a75c8b0d5ae
parent0b402c8e0dc3c93a0202629e8ac21d04aa22c030 (diff)
downloadop-kernel-dev-95263c9556796d7c22d901066ceb3787e11dbce5.zip
op-kernel-dev-95263c9556796d7c22d901066ceb3787e11dbce5.tar.gz
staging: slicoss: logical continuations should be on the previous line
Move logical or operator to previous line to comply with the standard kernel coding style. Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/slicoss/slicoss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index d3b9c2e..260aa57 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -614,8 +614,8 @@ static void slic_mac_config(struct adapter *adapter)
value |= GMCR_GBIT;
/* enable fullduplex */
- if ((adapter->linkduplex == LINK_FULLD)
- || (adapter->macopts & MAC_LOOPBACK)) {
+ if ((adapter->linkduplex == LINK_FULLD) ||
+ (adapter->macopts & MAC_LOOPBACK)) {
value |= GMCR_FULLD;
}
OpenPOWER on IntegriCloud