diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 55724b02316b..25304adece57 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c | |||
@@ -784,6 +784,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
784 | { | 784 | { |
785 | struct ath_softc *sc; | 785 | struct ath_softc *sc; |
786 | struct ieee80211_hw *hw; | 786 | struct ieee80211_hw *hw; |
787 | struct ath_common *common; | ||
787 | u8 csz; | 788 | u8 csz; |
788 | u32 val; | 789 | u32 val; |
789 | int ret = 0; | 790 | int ret = 0; |
@@ -858,9 +859,6 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
858 | sc->mem = pcim_iomap_table(pdev)[0]; | 859 | sc->mem = pcim_iomap_table(pdev)[0]; |
859 | sc->driver_data = id->driver_data; | 860 | sc->driver_data = id->driver_data; |
860 | 861 | ||
861 | /* Will be cleared in ath9k_start() */ | ||
862 | set_bit(SC_OP_INVALID, &sc->sc_flags); | ||
863 | |||
864 | ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc); | 862 | ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc); |
865 | if (ret) { | 863 | if (ret) { |
866 | dev_err(&pdev->dev, "request_irq failed\n"); | 864 | dev_err(&pdev->dev, "request_irq failed\n"); |
@@ -879,6 +877,10 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
879 | wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", | 877 | wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", |
880 | hw_name, (unsigned long)sc->mem, pdev->irq); | 878 | hw_name, (unsigned long)sc->mem, pdev->irq); |
881 | 879 | ||
880 | /* Will be cleared in ath9k_start() */ | ||
881 | common = ath9k_hw_common(sc->sc_ah); | ||
882 | set_bit(ATH_OP_INVALID, &common->op_flags); | ||
883 | |||
882 | return 0; | 884 | return 0; |
883 | 885 | ||
884 | err_init: | 886 | err_init: |