mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
staging: r8188eu: simplify the LED_CTL_POWER_OFF case
When a caller of rtw_led_control requests that the led be switched off, we should cancel the blink worker and set all blinking state variables to false. This does not depend on the current blinking state. Tested-by: Michael Straube <[email protected]> Signed-off-by: Martin Kaiser <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
1 parent
cbdeb78790
commit
d25cb8382a
1 file changed
+6
-20
@@ -381,26 +381,12 @@ void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction)
|
||||
case LED_CTL_POWER_OFF:
|
||||
pLed->CurrLedState = RTW_LED_OFF;
|
||||
pLed->BlinkingLedState = RTW_LED_OFF;
|
||||
if (pLed->bLedNoLinkBlinkInProgress) {
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
pLed->bLedNoLinkBlinkInProgress = false;
|
||||
}
|
||||
if (pLed->bLedLinkBlinkInProgress) {
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
pLed->bLedLinkBlinkInProgress = false;
|
||||
}
|
||||
if (pLed->bLedBlinkInProgress) {
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
pLed->bLedBlinkInProgress = false;
|
||||
}
|
||||
if (pLed->bLedWPSBlinkInProgress) {
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
pLed->bLedWPSBlinkInProgress = false;
|
||||
}
|
||||
if (pLed->bLedScanBlinkInProgress) {
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
pLed->bLedScanBlinkInProgress = false;
|
||||
}
|
||||
pLed->bLedNoLinkBlinkInProgress = false;
|
||||
pLed->bLedLinkBlinkInProgress = false;
|
||||
pLed->bLedBlinkInProgress = false;
|
||||
pLed->bLedWPSBlinkInProgress = false;
|
||||
pLed->bLedScanBlinkInProgress = false;
|
||||
cancel_delayed_work(&pLed->blink_work);
|
||||
SwLedOff(padapter, pLed);
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user