Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35c95ab9 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: move cancel_delayed_work_sync() out of ath_deinit_leds() 



We do this as we'll be moving the cancel elsewhere later.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9851bad7

drivers/net/wireless/ath/ath9k/main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1056,7 +1056,6 @@ static void ath_unregister_led(struct ath_led *led) 




static void ath_deinit_leds(struct ath_softc *sc)

static void ath_deinit_leds(struct ath_softc *sc)

{

{

	cancel_delayed_work_sync(&sc->ath_led_blink_work);

	ath_unregister_led(&sc->assoc_led);

	ath_unregister_led(&sc->assoc_led);

	sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;

	sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;

	ath_unregister_led(&sc->tx_led);

	ath_unregister_led(&sc->tx_led);
@@ -1113,6 +1112,7 @@ static void ath_init_leds(struct ath_softc *sc) 
	return;

	return;





fail:

fail:

	cancel_delayed_work_sync(&sc->ath_led_blink_work);

	ath_deinit_leds(sc);

	ath_deinit_leds(sc);

}

}
@@ -1251,11 +1251,13 @@ void ath_detach(struct ath_softc *sc) 




	DPRINTF(sc, ATH_DBG_CONFIG, "Detach ATH hw\n");

	DPRINTF(sc, ATH_DBG_CONFIG, "Detach ATH hw\n");





	ath_deinit_leds(sc);

	cancel_delayed_work_sync(&sc->ath_led_blink_work);

	cancel_delayed_work_sync(&sc->tx_complete_work);

	cancel_delayed_work_sync(&sc->tx_complete_work);

	cancel_delayed_work_sync(&sc->wiphy_work);

	cancel_delayed_work_sync(&sc->wiphy_work);

	cancel_work_sync(&sc->chan_work);

	cancel_work_sync(&sc->chan_work);





	ath_deinit_leds(sc);



	for (i = 0; i < sc->num_sec_wiphy; i++) {

	for (i = 0; i < sc->num_sec_wiphy; i++) {

		struct ath_wiphy *aphy = sc->sec_wiphy[i];

		struct ath_wiphy *aphy = sc->sec_wiphy[i];

		if (aphy == NULL)

		if (aphy == NULL)