staging: r8188eu: cancel blink_work before link blinking
authorMartin Kaiser <martin@kaiser.cx>
Sun, 11 Sep 2022 14:51:21 +0000 (16:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Sep 2022 11:07:49 +0000 (13:07 +0200)
Cancel blink_work before we start link blinking. Another worker will be
scheduled after the state variables are updated.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220911145122.15444-9-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_led.c

index 7cd6ed5385bbf68e4c1508e9235f79aa886713f9..0881c81f4c74c69bd52d7a6ac3e250058e12c2ee 100644 (file)
@@ -242,14 +242,14 @@ void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction)
 
                if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
                        return;
-               if (pLed->bLedNoLinkBlinkInProgress) {
-                       cancel_delayed_work(&pLed->blink_work);
+
+               cancel_delayed_work(&pLed->blink_work);
+               if (pLed->bLedNoLinkBlinkInProgress)
                        pLed->bLedNoLinkBlinkInProgress = false;
-               }
-               if (pLed->bLedBlinkInProgress) {
-                       cancel_delayed_work(&pLed->blink_work);
+
+               if (pLed->bLedBlinkInProgress)
                        pLed->bLedBlinkInProgress = false;
-               }
+
                pLed->bLedLinkBlinkInProgress = true;
                pLed->CurrLedState = LED_BLINK_NORMAL;
                if (pLed->bLedOn)