From: Martin Kaiser Date: Sat, 9 Apr 2022 16:32:05 +0000 (+0200) Subject: staging: r8188eu: summarize two if statements X-Git-Tag: v5.19-rc1~48^2~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b94dcb9adf57736a5fcab57fe1f540c52b2b30;p=thirdparty%2Flinux.git staging: r8188eu: summarize two if statements Summarize the two if statements at the end of send_beacon. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220409163212.241122-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 9fc4f18e9ab39..66dd063719913 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5763,9 +5763,7 @@ unsigned int send_beacon(struct adapter *padapter) } while ((poll % 10) != 0 && !bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); } while (!bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) - return _FAIL; - if (!bxmitok) + if (padapter->bSurpriseRemoved || padapter->bDriverStopped || !bxmitok) return _FAIL; return _SUCCESS;