diff options
| author |   David Woodhouse <dwmw2@infradead.org> | 2007-12-09 11:08:25 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:22 -0800 |
| commit | 020bb19e2f8cfebb314b8bce4bc48a511c6f5940 (patch) | |
| tree | 15d895b09d51b0e7e28b2ed8ac599a167b8df9b3 /drivers/net/wireless/libertas/debugfs.c | |
| parent | libertas: cope with device which already has firmware loaded (diff) | |
| download | linux-dev-020bb19e2f8cfebb314b8bce4bc48a511c6f5940.tar.xz linux-dev-020bb19e2f8cfebb314b8bce4bc48a511c6f5940.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/libertas/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index fe422b28a4f8..745191a68962 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; |