aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2022-09-05 22:01:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-09 09:52:08 +0200
commitde9c3e9ea926f8164b77383bfbc9fcac01b95af2 (patch)
tree5ff2f04a4491baf61a6511cb4a633bb8b1568280
parentstaging: r8188eu: always cancel blink_work before WPS blinking (diff)
staging: r8188eu: always update status before WPS blinking
Always update the status variables in rtw_led_control when we start WPS blinking. The code is easier to understand without the if conditions. Tested-by: Michael Straube <straube.linux@gmail.com> Signed-off-by: Martin Kaiser <martin@kaiser.cx> Link: https://lore.kernel.org/r/20220905200146.82259-5-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/r8188eu/core/rtw_led.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
index 72fef3ac8c0e..4841bb2898ba 100644
--- a/drivers/staging/r8188eu/core/rtw_led.c
+++ b/drivers/staging/r8188eu/core/rtw_led.c
@@ -313,18 +313,11 @@ void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction)
return;
cancel_delayed_work(&pLed->blink_work);
- if (pLed->bLedNoLinkBlinkInProgress)
- pLed->bLedNoLinkBlinkInProgress = false;
-
- if (pLed->bLedLinkBlinkInProgress)
- pLed->bLedLinkBlinkInProgress = false;
-
- if (pLed->bLedBlinkInProgress)
- pLed->bLedBlinkInProgress = false;
-
- if (pLed->bLedScanBlinkInProgress)
- pLed->bLedScanBlinkInProgress = false;
+ pLed->bLedNoLinkBlinkInProgress = false;
+ pLed->bLedLinkBlinkInProgress = false;
+ pLed->bLedBlinkInProgress = false;
+ pLed->bLedScanBlinkInProgress = false;
pLed->bLedWPSBlinkInProgress = true;
pLed->CurrLedState = LED_BLINK_WPS;
if (pLed->bLedOn)