diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 4348c7db3d1f..1608b289aa7b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -535,7 +535,7 @@ static int iwl5000_load_section(struct iwl_priv *priv, | |||
535 | iwl_write_direct32(priv, | 535 | iwl_write_direct32(priv, |
536 | FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL), | 536 | FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL), |
537 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE | | 537 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE | |
538 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL | | 538 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE | |
539 | FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD); | 539 | FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD); |
540 | 540 | ||
541 | iwl_release_nic_access(priv); | 541 | iwl_release_nic_access(priv); |
@@ -549,14 +549,13 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv, | |||
549 | { | 549 | { |
550 | int ret = 0; | 550 | int ret = 0; |
551 | 551 | ||
552 | ret = iwl5000_load_section( | 552 | ret = iwl5000_load_section(priv, inst_image, RTC_INST_LOWER_BOUND); |
553 | priv, inst_image, RTC_INST_LOWER_BOUND); | ||
554 | if (ret) | 553 | if (ret) |
555 | return ret; | 554 | return ret; |
556 | 555 | ||
557 | IWL_DEBUG_INFO("INST uCode section being loaded...\n"); | 556 | IWL_DEBUG_INFO("INST uCode section being loaded...\n"); |
558 | ret = wait_event_interruptible_timeout(priv->wait_command_queue, | 557 | ret = wait_event_interruptible_timeout(priv->wait_command_queue, |
559 | priv->ucode_write_complete, 5 * HZ); | 558 | priv->ucode_write_complete, 5 * HZ); |
560 | if (ret == -ERESTARTSYS) { | 559 | if (ret == -ERESTARTSYS) { |
561 | IWL_ERROR("Could not load the INST uCode section due " | 560 | IWL_ERROR("Could not load the INST uCode section due " |
562 | "to interrupt\n"); | 561 | "to interrupt\n"); |
@@ -753,6 +752,7 @@ static int iwl5000_alive_notify(struct iwl_priv *priv) | |||
753 | priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 7)); | 752 | priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 7)); |
754 | 753 | ||
755 | iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0); | 754 | iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0); |
755 | |||
756 | /* map qos queues to fifos one-to-one */ | 756 | /* map qos queues to fifos one-to-one */ |
757 | for (i = 0; i < ARRAY_SIZE(iwl5000_default_queue_to_tx_fifo); i++) { | 757 | for (i = 0; i < ARRAY_SIZE(iwl5000_default_queue_to_tx_fifo); i++) { |
758 | int ac = iwl5000_default_queue_to_tx_fifo[i]; | 758 | int ac = iwl5000_default_queue_to_tx_fifo[i]; |