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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index c16a2b6..b4170f6 100644 (file)
--- 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);