diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7708b19ca0cc..55ca752ae9e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -3569,7 +3569,8 @@ static void iwl4965_irq_handle_error(struct iwl_priv *priv) | |||
3569 | sizeof(priv->recovery_rxon)); | 3569 | sizeof(priv->recovery_rxon)); |
3570 | priv->error_recovering = 1; | 3570 | priv->error_recovering = 1; |
3571 | } | 3571 | } |
3572 | queue_work(priv->workqueue, &priv->restart); | 3572 | if (priv->cfg->mod_params->restart_fw) |
3573 | queue_work(priv->workqueue, &priv->restart); | ||
3573 | } | 3574 | } |
3574 | } | 3575 | } |
3575 | 3576 | ||
@@ -6847,6 +6848,7 @@ static int __init iwl4965_init(void) | |||
6847 | 6848 | ||
6848 | return ret; | 6849 | return ret; |
6849 | 6850 | ||
6851 | |||
6850 | #ifdef CONFIG_IWLWIFI_DEBUG | 6852 | #ifdef CONFIG_IWLWIFI_DEBUG |
6851 | pci_unregister_driver(&iwl_driver); | 6853 | pci_unregister_driver(&iwl_driver); |
6852 | #endif | 6854 | #endif |