Commit d25cb838 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220905200146.82259-2-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbdeb787

drivers/staging/r8188eu/core/rtw_led.c

+6 −20
Original line number Diff line number Diff line
@@ -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;

		}

		cancel_delayed_work(&pLed->blink_work);

		SwLedOff(padapter, pLed);

		break;

	default: