aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-09 11:08:25 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:06:22 -0800
commit020bb19e2f8cfebb314b8bce4bc48a511c6f5940 (patch)
tree15d895b09d51b0e7e28b2ed8ac599a167b8df9b3
parent6d35fdfced3922aa27f130eec2b28857c39298fd (diff)
libertas: stop debugfs code looking at cmdpendingq
It doesn't need to wait until no commands are pending anyway -- it only needs to wait until the scan is finished. We can hopefully find it something else to wait on too -- it's the only user of the cmd_pending waitqueue. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/debugfs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index fe422b28a4f..745191a6896 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -321,8 +321,7 @@ static ssize_t lbs_setuserscan(struct file *file,
lbs_scan_networks(priv, scan_cfg, 1);
wait_event_interruptible(priv->cmd_pending,
- priv->surpriseremoved ||
- (!priv->cur_cmd && list_empty(&priv->cmdpendingq)));
+ priv->surpriseremoved || !priv->last_scanned_channel);
if (priv->surpriseremoved)
goto out_scan_cfg;