Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c4ab41272b55a08741d2e68966aae700e2e6d597
Commit:     c4ab41272b55a08741d2e68966aae700e2e6d597
Parent:     b23b2061e5758d4827630ee900b4b290376d0059
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 15 00:41:51 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:07:31 2008 -0800

    libertas: remove some pointless checks for cmdnode buffer being present
    
    We allocate them all at the same time, at startup. If they go missing,
    we have more serious things to worry about, and the resulting oops will
    be a perfectly acceptable result.
    
    Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/cmd.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/net/wireless/libertas/cmd.c 
b/drivers/net/wireless/libertas/cmd.c
index 4dc6bbe..4ffb84a 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1166,8 +1166,8 @@ void lbs_queue_cmd(struct lbs_private *priv,
 
        lbs_deb_enter(LBS_DEB_HOST);
 
-       if (!cmdnode || !cmdnode->cmdbuf) {
-               lbs_deb_host("QUEUE_CMD: cmdnode or cmdbuf is NULL\n");
+       if (!cmdnode) {
+               lbs_deb_host("QUEUE_CMD: cmdnode is NULL\n");
                goto done;
        }
        if (!cmdnode->cmdbuf->size) {
@@ -1195,7 +1195,7 @@ void lbs_queue_cmd(struct lbs_private *priv,
        spin_unlock_irqrestore(&priv->driver_lock, flags);
 
        lbs_deb_host("QUEUE_CMD: inserted command 0x%04x into cmdpendingq\n",
-              le16_to_cpu(cmdnode->cmdbuf->command));
+                    le16_to_cpu(cmdnode->cmdbuf->command));
 
 done:
        lbs_deb_leave(LBS_DEB_HOST);
@@ -1380,13 +1380,6 @@ int lbs_prepare_and_send_command(struct lbs_private 
*priv,
 
        lbs_deb_host("PREP_CMD: command 0x%04x\n", cmd_no);
 
-       if (!cmdptr) {
-               lbs_deb_host("PREP_CMD: cmdptr is NULL\n");
-               lbs_cleanup_and_insert_cmd(priv, cmdnode);
-               ret = -1;
-               goto done;
-       }
-
        /* Set sequence number, command and INT option */
        priv->seqnum++;
        cmdptr->seqnum = cpu_to_le16(priv->seqnum);
@@ -1786,8 +1779,7 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *cmdnode)
        cmdnode->callback = NULL;
        cmdnode->callback_arg = 0;
 
-       if (cmdnode->cmdbuf != NULL)
-               memset(cmdnode->cmdbuf, 0, LBS_CMD_BUFFER_SIZE);
+       memset(cmdnode->cmdbuf, 0, LBS_CMD_BUFFER_SIZE);
 
        lbs_deb_leave(LBS_DEB_HOST);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to