From f1a3189a81426d65518782841dfe27e62998f231 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 15 Dec 2007 02:06:16 -0500 Subject: [PATCH] --- yaml --- r: 79231 b: refs/heads/master c: ad12d0f418b7d3bbc6d1ccc4ff0858361cf0aafe h: refs/heads/master i: 79229: 2b03fc47b2b8c0db7623820dca1b992adc0f468e 79227: 2562dd1e159119880b52f01fb5faa5221e2cbb59 79223: 715010270a0dcf4194f763648895475761479c72 79215: f882cbbeef431688765860f1b46e5896b4e25e2b 79199: 0423f4be9c439c8e8a6738ecb1a0f4430603140c 79167: 9a2fa39743f4faef96f7570869695d6ab083314c 79103: e53a42085d722ad450543618c16bb407ef546b7d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/cmd.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 209849ee4135..af835e605d6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ba2f8a0217cd6116fcbac056b360bb0db045379 +refs/heads/master: ad12d0f418b7d3bbc6d1ccc4ff0858361cf0aafe diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/drivers/net/wireless/libertas/cmd.c index 4c0bd9f5c196..e7f07c3098f4 100644 --- a/trunk/drivers/net/wireless/libertas/cmd.c +++ b/trunk/drivers/net/wireless/libertas/cmd.c @@ -1310,7 +1310,8 @@ void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd, cmd->cmdwaitqwoken = 1; wake_up_interruptible(&cmd->cmdwait_q); - __lbs_cleanup_and_insert_cmd(priv, cmd); + if (!cmd->callback) + __lbs_cleanup_and_insert_cmd(priv, cmd); priv->cur_cmd = NULL; } @@ -2219,6 +2220,7 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command, priv->cur_cmd_retcode = 0; ret = -1; } + __lbs_cleanup_and_insert_cmd(priv, cmdnode); spin_unlock_irqrestore(&priv->driver_lock, flags); done: