diff options
| author | John W. Linville | 2013-11-05 15:53:10 -0500 |
|---|---|---|
| committer | John W. Linville | 2013-11-05 15:53:10 -0500 |
| commit | c046555966e4a3a75b731e05ece3b1d763ac56ae (patch) | |
| tree | 2957e97a4052ca069ff7d05abf49e6b9647be9e7 /drivers/net/wireless/iwlwifi/dvm | |
| parent | dce1ebabcb0ac12113487221663c2aba648dd244 (diff) | |
| parent | c92f06a1dea1e444213d860a20023f72c134e20a (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/ucode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c index 86270b69cd02..63637949a146 100644 --- a/drivers/net/wireless/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c @@ -330,15 +330,14 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, enum iwl_ucode_type old_type; static const u8 alive_cmd[] = { REPLY_ALIVE }; - old_type = priv->cur_ucode; - priv->cur_ucode = ucode_type; fw = iwl_get_ucode_image(priv, ucode_type); + if (WARN_ON(!fw)) + return -EINVAL; + old_type = priv->cur_ucode; + priv->cur_ucode = ucode_type; priv->ucode_loaded = false; - if (!fw) - return -EINVAL; - iwl_init_notification_wait(&priv->notif_wait, &alive_wait, alive_cmd, ARRAY_SIZE(alive_cmd), iwl_alive_fn, &alive_data); |