Commit ad12d0f4 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller

libertas: let __lbs_cmd() free its own cmdnode

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ba2f8a0
...@@ -1310,7 +1310,8 @@ void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd, ...@@ -1310,7 +1310,8 @@ void lbs_complete_command(struct lbs_private *priv, struct cmd_ctrl_node *cmd,
cmd->cmdwaitqwoken = 1; cmd->cmdwaitqwoken = 1;
wake_up_interruptible(&cmd->cmdwait_q); 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; priv->cur_cmd = NULL;
} }
...@@ -2219,6 +2220,7 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command, ...@@ -2219,6 +2220,7 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command,
priv->cur_cmd_retcode = 0; priv->cur_cmd_retcode = 0;
ret = -1; ret = -1;
} }
__lbs_cleanup_and_insert_cmd(priv, cmdnode);
spin_unlock_irqrestore(&priv->driver_lock, flags); spin_unlock_irqrestore(&priv->driver_lock, flags);
done: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment