[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20191127123052.16424-3-dorothea.ehrl@fau.de>
Date: Wed, 27 Nov 2019 13:30:50 +0100
From: Dorothea Ehrl <dorothea.ehrl@....de>
To: manishc@...vell.com, GR-Linux-NIC-Dev@...vell.com,
gregkh@...uxfoundation.org, netdev@...r.kernel.org,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Cc: linux-kernel@...cs.fau.de, Dorothea Ehrl <dorothea.ehrl@....de>,
Vanessa Hack <vanessa.hack@....de>
Subject: [PATCH 3/5] staging/qlge: add braces to conditional statement
This patch fixes "CHECK: braces {} should be used on all arms of this
statement" by checkpatch.pl.
Signed-off-by: Dorothea Ehrl <dorothea.ehrl@....de>
Co-developed-by: Vanessa Hack <vanessa.hack@....de>
Signed-off-by: Vanessa Hack <vanessa.hack@....de>
---
drivers/staging/qlge/qlge_main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 587102aa7fbf..f5ab6cc7050a 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -178,8 +178,9 @@ int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 err_bit)
"register 0x%.08x access error, value = 0x%.08x!.\n",
reg, temp);
return -EIO;
- } else if (temp & bit)
+ } else if (temp & bit) {
return 0;
+ }
udelay(UDELAY_DELAY);
}
netif_alert(qdev, probe, qdev->ndev,
@@ -3731,8 +3732,9 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
/* Wait for the NIC and MGMNT FIFOs to empty. */
ql_wait_fifo_empty(qdev);
- } else
+ } else {
clear_bit(QL_ASIC_RECOVERY, &qdev->flags);
+ }
ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);
--
2.20.1
Powered by blists - more mailing lists