From: Martin Kaiser <martin@kaiser.cx>
Date: Mon, 5 Sep 2022 20:01:46 +0000 (+0200)
Subject: staging: r8188eu: do not "scan blink" if we have a link
X-Git-Tag: block-6.1-2022-13-10~15^2~114
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bbec514624f1e62d026253c566b67e4e79d9b681;p=linux-block.git

staging: r8188eu: do not "scan blink" if we have a link

Do not blink the led to indicate that we're scanning if we are already
connected to a wireless network.

Tested-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220905200146.82259-8-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
index f5af2e25e34a..5b7e12421d19 100644
--- a/drivers/staging/r8188eu/core/rtw_led.c
+++ b/drivers/staging/r8188eu/core/rtw_led.c
@@ -258,9 +258,10 @@ void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction)
 		}
 		break;
 	case LED_CTL_SITE_SURVEY:
-		if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED))) {
-			;
-		} else if (!pLed->bLedScanBlinkInProgress) {
+		if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED)))
+			return;
+
+		if (!pLed->bLedScanBlinkInProgress) {
 			if (IS_LED_WPS_BLINKING(pLed))
 				return;
 			if (pLed->bLedNoLinkBlinkInProgress) {