mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
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>
This commit is contained in:
parent
0780158f90
commit
f9ceb182ba
1 changed files with 2 additions and 6 deletions
|
@ -1885,11 +1885,9 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
|
||||||
{
|
{
|
||||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||||
|
|
||||||
if (pcmd->res == H2C_DROPPED) {
|
if (pcmd->res != H2C_SUCCESS) {
|
||||||
/* TODO: cancel timer and do timeout handler directly... */
|
/* TODO: cancel timer and do timeout handler directly... */
|
||||||
_set_timer(&pmlmepriv->scan_to_timer, 1);
|
_set_timer(&pmlmepriv->scan_to_timer, 1);
|
||||||
} else if (pcmd->res != H2C_SUCCESS) {
|
|
||||||
_set_timer(&pmlmepriv->scan_to_timer, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* free cmd */
|
/* free cmd */
|
||||||
|
@ -1915,11 +1913,9 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
|
||||||
{
|
{
|
||||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||||
|
|
||||||
if (pcmd->res == H2C_DROPPED) {
|
if (pcmd->res != H2C_SUCCESS) {
|
||||||
/* TODO: cancel timer and do timeout handler directly... */
|
/* TODO: cancel timer and do timeout handler directly... */
|
||||||
_set_timer(&pmlmepriv->assoc_timer, 1);
|
_set_timer(&pmlmepriv->assoc_timer, 1);
|
||||||
} else if (pcmd->res != H2C_SUCCESS) {
|
|
||||||
_set_timer(&pmlmepriv->assoc_timer, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
rtw_free_cmd_obj(pcmd);
|
rtw_free_cmd_obj(pcmd);
|
||||||
|
|
Loading…
Reference in a new issue