diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index fc52d3229d66..9e41e1bb7c79 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2774,18 +2774,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2774 | goto out_free_eeprom; | 2774 | goto out_free_eeprom; |
2775 | /* At this point both hw and priv are initialized. */ | 2775 | /* At this point both hw and priv are initialized. */ |
2776 | 2776 | ||
2777 | /********************************** | ||
2778 | * 7. Initialize module parameters | ||
2779 | **********************************/ | ||
2780 | |||
2781 | /* Disable radio (SW RF KILL) via parameter when loading driver */ | ||
2782 | if (priv->cfg->mod_params->disable) { | ||
2783 | set_bit(STATUS_RF_KILL_SW, &priv->status); | ||
2784 | IWL_DEBUG_INFO(priv, "Radio disabled.\n"); | ||
2785 | } | ||
2786 | |||
2787 | /******************** | 2777 | /******************** |
2788 | * 8. Setup services | 2778 | * 7. Setup services |
2789 | ********************/ | 2779 | ********************/ |
2790 | spin_lock_irqsave(&priv->lock, flags); | 2780 | spin_lock_irqsave(&priv->lock, flags); |
2791 | iwl_disable_interrupts(priv); | 2781 | iwl_disable_interrupts(priv); |
@@ -2809,7 +2799,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2809 | iwl_setup_rx_handlers(priv); | 2799 | iwl_setup_rx_handlers(priv); |
2810 | 2800 | ||
2811 | /********************************** | 2801 | /********************************** |
2812 | * 9. Setup and register mac80211 | 2802 | * 8. Setup and register mac80211 |
2813 | **********************************/ | 2803 | **********************************/ |
2814 | 2804 | ||
2815 | /* enable interrupts if needed: hw bug w/a */ | 2805 | /* enable interrupts if needed: hw bug w/a */ |