diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
| commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
| tree | eab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/wireless/iwlwifi/iwl-hcmd.c | |
| parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
| parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) | |
| download | talos-op-linux-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.tar.gz talos-op-linux-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-hcmd.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 905645d15a9b..e8002c1d3eba 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c @@ -199,13 +199,13 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) } if (test_bit(STATUS_RF_KILL_HW, &priv->status)) { - IWL_DEBUG_INFO(priv, "Command %s aborted: RF KILL Switch\n", + IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n", get_cmd_string(cmd->id)); ret = -ECANCELED; goto fail; } if (test_bit(STATUS_FW_ERROR, &priv->status)) { - IWL_DEBUG_INFO(priv, "Command %s failed: FW Error\n", + IWL_ERR(priv, "Command %s failed: FW Error\n", get_cmd_string(cmd->id)); ret = -EIO; goto fail; |
