diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-11 14:40:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-11 14:40:06 -0800 |
| commit | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (patch) | |
| tree | 68413952f4826d6d65219119d6b6e3cab115f68c | |
| parent | eb37b41cc2274cdecfc19d371717c321fe2ab426 (diff) | |
| parent | 9757d55652f98836b9a4cac307a01f8b0232dbd9 (diff) | |
| download | linux-3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833.tar.gz linux-3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833.tar.bz2 linux-3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index fb50aa0fc996..f830fe1e4adc 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -37,6 +37,8 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = { { 0 } }; +static void ath_detach(struct ath_softc *sc); + static int ath_get_channel(struct ath_softc *sc, struct ieee80211_channel *chan) { @@ -813,7 +815,7 @@ static int ath_start_rfkill_poll(struct ath_softc *sc) pci_iounmap(sc->pdev, sc->mem); pci_release_region(sc->pdev, 0); pci_disable_device(sc->pdev); - ieee80211_free_hw(hw); + ieee80211_free_hw(sc->hw); return -EIO; } else { sc->sc_flags |= SC_OP_RFKILL_REGISTERED; |