Skip to content

Commit

Permalink
ath9k_hw: fix hardware deinit
Browse files Browse the repository at this point in the history
Without this you will get a panic if the device initialization
fails. Also, free ath_hw instance properly. ath9k_hw_deinit()
shouldn't do it.

Cc: stable@kernel.org
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Sujith authored and linvjw committed Mar 23, 2010
1 parent 05020d2 commit 736b3a2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/wireless/ath/ath9k/hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ void ath9k_hw_deinit(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);

if (common->state <= ATH_HW_INITIALIZED)
if (common->state < ATH_HW_INITIALIZED)
goto free_hw;

if (!AR_SREV_9100(ah))
Expand All @@ -1238,8 +1238,6 @@ void ath9k_hw_deinit(struct ath_hw *ah)
free_hw:
if (!AR_SREV_9280_10_OR_LATER(ah))
ath9k_hw_rf_free_ext_banks(ah);
kfree(ah);
ah = NULL;
}
EXPORT_SYMBOL(ath9k_hw_deinit);

Expand Down
3 changes: 3 additions & 0 deletions drivers/net/wireless/ath/ath9k/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,9 @@ static void ath9k_deinit_softc(struct ath_softc *sc)

tasklet_kill(&sc->intr_tq);
tasklet_kill(&sc->bcon_tasklet);

kfree(sc->sc_ah);
sc->sc_ah = NULL;
}

void ath9k_deinit_device(struct ath_softc *sc)
Expand Down

0 comments on commit 736b3a2

Please sign in to comment.