diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-26 20:00:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-26 20:00:11 -0400 |
commit | 59731bb8c4f1536c5b698dc1aec82d7a5cef41eb (patch) | |
tree | b6e245cfae009fe9e108d6adaed3e0f56fd2969e /drivers/net/wireless/iwlwifi/dvm/lib.c | |
parent | 729d8d182bbf296b32cb2e7f970801eb6ce33c6a (diff) | |
parent | bd4ace2a36e7c87bb5f3eceb54d3b304d395dcf0 (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/lib.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c index 9879550a0fe..3d5bdc4217a 100644 --- a/drivers/net/wireless/iwlwifi/dvm/lib.c +++ b/drivers/net/wireless/iwlwifi/dvm/lib.c @@ -1288,12 +1288,6 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) if (!(cmd->flags & CMD_ASYNC)) lockdep_assert_held(&priv->mutex); - if (priv->ucode_owner == IWL_OWNERSHIP_TM && - !(cmd->flags & CMD_ON_DEMAND)) { - IWL_DEBUG_HC(priv, "tm own the uCode, no regular hcmd send\n"); - return -EIO; - } - return iwl_trans_send_cmd(priv->trans, cmd); } |