Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=020bb19e2f8cfebb314b8bce4bc48a511c6f5940
Commit:     020bb19e2f8cfebb314b8bce4bc48a511c6f5940
Parent:     6d35fdfced3922aa27f130eec2b28857c39298fd
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 9 11:08:25 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:22 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 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 fe422b2..745191a 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to