iwlwifi: remove late null-check and duplicate bug_on

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl4965-base.c

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 076c5518211b6bd55dc332d3775858f053b91689..fa11eb95699b65f17b1b8743ee82e01f0ebd96a6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -806,10 +806,6 @@ out:
 
 int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 {
-       /* A command can not be asynchronous AND expect an SKB to be set. */
-       BUG_ON((cmd->meta.flags & CMD_ASYNC) &&
-              (cmd->meta.flags & CMD_WANT_SKB));
-
        if (cmd->meta.flags & CMD_ASYNC)
                return iwl_send_cmd_async(priv, cmd);
 
@@ -2040,9 +2036,6 @@ static void iwl_activate_qos(struct iwl_priv *priv, u8 force)
 {
        unsigned long flags;
 
-       if (priv == NULL)
-               return;
-
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                return;