diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:53:10 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:53:10 -0500 |
| commit | c046555966e4a3a75b731e05ece3b1d763ac56ae (patch) | |
| tree | 2957e97a4052ca069ff7d05abf49e6b9647be9e7 /drivers/net/wireless/iwlwifi/pcie | |
| parent | dce1ebabcb0ac12113487221663c2aba648dd244 (diff) | |
| parent | c92f06a1dea1e444213d860a20023f72c134e20a (diff) | |
| download | op-kernel-dev-c046555966e4a3a75b731e05ece3b1d763ac56ae.zip op-kernel-dev-c046555966e4a3a75b731e05ece3b1d763ac56ae.tar.gz | |
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index f644fcf..059c5ac 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c @@ -1499,12 +1499,11 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans, IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n", get_cmd_string(trans_pcie, cmd->id)); - if (WARN_ON(test_and_set_bit(STATUS_HCMD_ACTIVE, - &trans_pcie->status))) { - IWL_ERR(trans, "Command %s: a command is already active!\n", - get_cmd_string(trans_pcie, cmd->id)); + if (WARN(test_and_set_bit(STATUS_HCMD_ACTIVE, + &trans_pcie->status), + "Command %s: a command is already active!\n", + get_cmd_string(trans_pcie, cmd->id))) return -EIO; - } IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n", get_cmd_string(trans_pcie, cmd->id)); |
