asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Browse source
This commit is contained in:
David S. Miller 2008-11-11 14:40:06 -08:00
commit 3ac38c3a2e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/ath9k/main.c
View file

@ -37,6 +37,8 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = {
{ 0 } { 0 }
}; };
static void ath_detach(struct ath_softc *sc);
static int ath_get_channel(struct ath_softc *sc, static int ath_get_channel(struct ath_softc *sc,
struct ieee80211_channel *chan) 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_iounmap(sc->pdev, sc->mem);
pci_release_region(sc->pdev, 0); pci_release_region(sc->pdev, 0);
pci_disable_device(sc->pdev); pci_disable_device(sc->pdev);
ieee80211_free_hw(hw); ieee80211_free_hw(sc->hw);
return -EIO; return -EIO;
} else { } else {
sc->sc_flags |= SC_OP_RFKILL_REGISTERED; sc->sc_flags |= SC_OP_RFKILL_REGISTERED;