summaryrefslogtreecommitdiff
path: root/drivers/staging/qlge
diff options
context:
space:
mode:
authorDorothea Ehrl <dorothea.ehrl@fau.de>2019-11-27 13:30:50 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-10 10:34:43 +0100
commit2d060684ab4c2a9078c63a00892037dd4cfa6966 (patch)
tree29b9d382a45688af8eabcf8649edb8aed963aac8 /drivers/staging/qlge
parentd00208b6464fd1127bf1b82b31789f1ac7d02a4a (diff)
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@fau.de> Co-developed-by: Vanessa Hack <vanessa.hack@fau.de> Signed-off-by: Vanessa Hack <vanessa.hack@fau.de> Link: https://lore.kernel.org/r/20191127123052.16424-3-dorothea.ehrl@fau.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/qlge')
-rw-r--r--drivers/staging/qlge/qlge_main.c6
1 files 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);