diff options
| author | Rebecca Mckeever <remckee0@gmail.com> | 2022-04-05 04:10:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-05 17:04:10 +0300 |
| commit | f9ceb182bad81b7c2fc238cc16ce826b7a3d3e48 (patch) | |
| tree | 9e78bf0d2058372f7781b8bd298395e2607fc060 /drivers/staging/rtl8723bs/core | |
| parent | 0780158f909fa3f1e2c43071ae77bc8602c028b4 (diff) | |
| download | linux-f9ceb182bad81b7c2fc238cc16ce826b7a3d3e48.tar.xz | |
staging: rtl8723bs: combine both sides of conditional statement
Both sides of conditional statement are the same except for the comment.
Additional instances found with git grep.
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rebecca Mckeever <remckee0@gmail.com>
Link: https://lore.kernel.org/r/23cfd782614e09f57a514aab68407183702b0a2c.1649120568.git.remckee0@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs/core')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index c16a2b644296..b4170f64d118 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1885,11 +1885,9 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - if (pcmd->res == H2C_DROPPED) { + if (pcmd->res != H2C_SUCCESS) { /* TODO: cancel timer and do timeout handler directly... */ _set_timer(&pmlmepriv->scan_to_timer, 1); - } else if (pcmd->res != H2C_SUCCESS) { - _set_timer(&pmlmepriv->scan_to_timer, 1); } /* free cmd */ @@ -1915,11 +1913,9 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - if (pcmd->res == H2C_DROPPED) { + if (pcmd->res != H2C_SUCCESS) { /* TODO: cancel timer and do timeout handler directly... */ _set_timer(&pmlmepriv->assoc_timer, 1); - } else if (pcmd->res != H2C_SUCCESS) { - _set_timer(&pmlmepriv->assoc_timer, 1); } rtw_free_cmd_obj(pcmd); |