diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:58:13 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:58:13 (GMT) |
| commit | 444474dd5b33332100311af8ff31a587f6105011 (patch) | |
| tree | 5d5817ab3198661ab8dcb5348b7139ac6e51b794 /drivers/net/wireless/iwlwifi/pcie/tx.c | |
| parent | a72e25f78134cc0c1ef2adc99d6c3680ebd80e35 (diff) | |
| parent | 246dd9922e859768aa522daa6c1c601785e57e0c (diff) | |
| download | linux-fsl-qoriq-444474dd5b33332100311af8ff31a587f6105011.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index f45eb29..b416841 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c @@ -1539,6 +1539,9 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans, "Clearing HCMD_ACTIVE for command %s\n", get_cmd_string(trans_pcie, cmd->id)); ret = -ETIMEDOUT; + + iwl_op_mode_nic_error(trans->op_mode); + goto cancel; } } |