diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-20 20:10:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-20 20:10:00 +0800 |
| commit | 1354004c0e6b966cbaa6298cd3787ca2609ac2cc (patch) | |
| tree | 7aa06dc4c17792fd8054f2577e64fc23b60a6b36 /drivers/net/wireless | |
| parent | ff91347bcf47eaa6138a1cb41c61bf2013e83d32 (diff) | |
| parent | 07410cfb6ec53720b547d0b037680444f4616566 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rt
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/dev.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/ucode.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h index 3441f70d0ff9..6e8cdb8a0cc5 100644 --- a/drivers/net/wireless/iwlwifi/dvm/dev.h +++ b/drivers/net/wireless/iwlwifi/dvm/dev.h @@ -708,7 +708,6 @@ struct iwl_priv { unsigned long reload_jiffies; int reload_count; bool ucode_loaded; - bool init_ucode_run; /* Don't run init uCode again */ u8 plcp_delta_threshold; diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c index cf03ef5619d9..8b2dedc30159 100644 --- a/drivers/net/wireless/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c @@ -418,9 +418,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv) if (!priv->fw->img[IWL_UCODE_INIT].sec[0].len) return 0; - if (priv->init_ucode_run) - return 0; - iwl_init_notification_wait(&priv->notif_wait, &calib_wait, calib_complete, ARRAY_SIZE(calib_complete), iwlagn_wait_calib, priv); @@ -440,8 +437,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv) */ ret = iwl_wait_notification(&priv->notif_wait, &calib_wait, UCODE_CALIB_TIMEOUT); - if (!ret) - priv->init_ucode_run = true; goto out; |