From 219115bf9fe83615675fa79b216cd5d555a57306 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 9 Dec 2007 11:08:25 -0500 Subject: [PATCH] --- yaml --- r: 79133 b: refs/heads/master c: 020bb19e2f8cfebb314b8bce4bc48a511c6f5940 h: refs/heads/master i: 79131: f6ba5c70262be70643f1bc00ed2dbd4e909f59b3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/debugfs.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d21e9691b218..4931db7ec514 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d35fdfced3922aa27f130eec2b28857c39298fd +refs/heads/master: 020bb19e2f8cfebb314b8bce4bc48a511c6f5940 diff --git a/trunk/drivers/net/wireless/libertas/debugfs.c b/trunk/drivers/net/wireless/libertas/debugfs.c index fe422b28a4f8..745191a68962 100644 --- a/trunk/drivers/net/wireless/libertas/debugfs.c +++ b/trunk/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;