summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8723bs/hal
diff options
context:
space:
mode:
authorQuytelda Kahja2018-06-17 07:30:33 +0200
committerGreg Kroah-Hartman2018-06-28 15:03:16 +0200
commitfdf620d6970c93d9bfe8975130d49d2a060153c1 (patch)
treef44eba4a38e7ea13a930baf558df568b6d4790d3 /drivers/staging/rtl8723bs/hal
parentstaging: rtl8723bs: Fix camel-case names in phy_get_tx_pwr_lmt(). (diff)
downloadkernel-qcow2-linux-fdf620d6970c93d9bfe8975130d49d2a060153c1.tar.gz
kernel-qcow2-linux-fdf620d6970c93d9bfe8975130d49d2a060153c1.tar.xz
kernel-qcow2-linux-fdf620d6970c93d9bfe8975130d49d2a060153c1.zip
staging: rtl8723bs: Combine if statements with equivalent body.
Two if statements that carry out the same operation can be combined with a logical OR. Signed-off-by: Quytelda Kahja <quytelda@tamalin.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs/hal')
-rw-r--r--drivers/staging/rtl8723bs/hal/hal_com_phycfg.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 7e27d7ff29fa..5d44aee44eb1 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -1734,12 +1734,8 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
/* workaround for wrong index combination to obtain tx power limit, */
/* OFDM only exists in BW 20M */
- if (idx_rate_sctn == 1)
- idx_bandwidth = 0;
-
- /* workaround for wrong index combination to obtain tx power limit, */
/* CCK table will only be given in BW 20M */
- if (idx_rate_sctn == 0)
+ if (idx_rate_sctn == 0 || idx_rate_sctn == 1)
idx_bandwidth = 0;
/* workaround for wrong indxe combination to obtain tx power limit, */