Skip to content

Commit

Permalink
libertas: stop debugfs code looking at cmdpendingq
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 6d35fdf commit 020bb19
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/libertas/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 020bb19

Please sign in to comment.