diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-08 01:35:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:06:15 +0100 |
| commit | ac47246e246c183ed68b3fdb307a83d00313a325 (patch) | |
| tree | be16670a7fd60c0acd07a6914b424b6b1bebb4ff /drivers/net/wireless/libertas/debugfs.c | |
| parent | libertas: Fix up error handling in lbs_setuserscan() (diff) | |
| download | linux-ac47246e246c183ed68b3fdb307a83d00313a325.tar.xz linux-ac47246e246c183ed68b3fdb307a83d00313a325.zip | |
libertas: kill adapter->nr_cmd_pending
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, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index b0a76c5bec66..9a041e5b209c 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c @@ -322,7 +322,8 @@ static ssize_t lbs_setuserscan(struct file *file, lbs_scan_networks(priv, scan_cfg, 1); wait_event_interruptible(priv->adapter->cmd_pending, - priv->adapter->surpriseremoved || !priv->adapter->nr_cmd_pending); + priv->adapter->surpriseremoved || + (!priv->adapter->cur_cmd && list_empty(&priv->adapter->cmdpendingq))); if (priv->adapter->surpriseremoved) goto out_scan_cfg; |