diff options
| author | Mark Brown | 2019-05-20 12:54:21 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-20 12:54:21 +0200 |
| commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
| tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/staging/rtl8723bs/core/rtw_debug.c | |
| parent | spi: tegra114: add support for TX and RX trimmers (diff) | |
| parent | Linux 5.2-rc1 (diff) | |
| download | kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip | |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/staging/rtl8723bs/core/rtw_debug.c')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_debug.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c index a3c8a712bdc2..9f8446ccf771 100644 --- a/drivers/staging/rtl8723bs/core/rtw_debug.c +++ b/drivers/staging/rtl8723bs/core/rtw_debug.c @@ -1395,16 +1395,16 @@ ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t } num = sscanf(tmp, "%x %x", module, module+1); - if (1 == num) { - if (0 == module[0]) + if (num == 1) { + if (module[0] == 0) memset(module, 0, sizeof(module)); else memset(module, 0xFF, sizeof(module)); - } else if (2 != num) { + } else if (num != 2) { DBG_871X(FUNC_ADPT_FMT ": input(\"%s\") format incorrect!\n", FUNC_ADPT_ARG(padapter), tmp); - if (0 == num) + if (num == 0) return -EFAULT; } @@ -1425,9 +1425,8 @@ int proc_get_btcoex_info(struct seq_file *m, void *v) padapter = (struct adapter *)rtw_netdev_priv(dev); pbuf = rtw_zmalloc(bufsize); - if (NULL == pbuf) { + if (!pbuf) return -ENOMEM; - } rtw_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize); |