From ad12d0f418b7d3bbc6d1ccc4ff0858361cf0aafe Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 15 Dec 2007 02:06:16 -0500 Subject: libertas: let __lbs_cmd() free its own cmdnode Signed-off-by: David Woodhouse Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/cmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/net/wireless/libertas/cmd.c') diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 4c0bd9f5c19..e7f07c3098f 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/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: -- cgit v1.2.3-70-g09d2