diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-29 21:56:19 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-29 21:56:19 -0700 |
commit | e8573758d520279be9510d63177968627ab98752 (patch) | |
tree | 2dd8fd6c4eaf10c19d0f30db12ff7ccba925250b /drivers/net/wireless/at76c50x-usb.c | |
parent | 4e0168fa4842e27795a75b205a510f25b62181d9 (diff) | |
parent | aeeab4ff06b8e29cfe2fe730ba626f7e2487ba03 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 744f4f4dd3d..8d93ca4651b 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1873,18 +1873,18 @@ static void at76_dwork_hw_scan(struct work_struct *work) if (ret != CMD_STATUS_COMPLETE) { queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan, SCAN_POLL_INTERVAL); - goto exit; + mutex_unlock(&priv->mtx); + return; } - ieee80211_scan_completed(priv->hw, false); - if (is_valid_ether_addr(priv->bssid)) at76_join(priv); - ieee80211_wake_queues(priv->hw); - -exit: mutex_unlock(&priv->mtx); + + ieee80211_scan_completed(priv->hw, false); + + ieee80211_wake_queues(priv->hw); } static int at76_hw_scan(struct ieee80211_hw *hw, |