diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-15 02:06:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:07:34 -0500 |
commit | ad12d0f418b7d3bbc6d1ccc4ff0858361cf0aafe (patch) | |
tree | 5491b7f28ff24c26e6c5939e72ebb3fc7dd44196 /drivers/net/wireless/libertas/cmd.c | |
parent | 5ba2f8a0217cd6116fcbac056b360bb0db045379 (diff) |
libertas: let __lbs_cmd() free its own cmdnode
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.c')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 4c0bd9f5c196..e7f07c3098f4 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, | |||
1310 | cmd->cmdwaitqwoken = 1; | 1310 | cmd->cmdwaitqwoken = 1; |
1311 | wake_up_interruptible(&cmd->cmdwait_q); | 1311 | wake_up_interruptible(&cmd->cmdwait_q); |
1312 | 1312 | ||
1313 | __lbs_cleanup_and_insert_cmd(priv, cmd); | 1313 | if (!cmd->callback) |
1314 | __lbs_cleanup_and_insert_cmd(priv, cmd); | ||
1314 | priv->cur_cmd = NULL; | 1315 | priv->cur_cmd = NULL; |
1315 | } | 1316 | } |
1316 | 1317 | ||
@@ -2219,6 +2220,7 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command, | |||
2219 | priv->cur_cmd_retcode = 0; | 2220 | priv->cur_cmd_retcode = 0; |
2220 | ret = -1; | 2221 | ret = -1; |
2221 | } | 2222 | } |
2223 | __lbs_cleanup_and_insert_cmd(priv, cmdnode); | ||
2222 | spin_unlock_irqrestore(&priv->driver_lock, flags); | 2224 | spin_unlock_irqrestore(&priv->driver_lock, flags); |
2223 | 2225 | ||
2224 | done: | 2226 | done: |