summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/orinoco/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-22 14:36:18 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-22 14:36:18 -0700
commitdb138908ccff404b9920f18f6244f4bff2368c04 (patch)
tree18734f9b833a5f1134fc138a00d9223fc2afa028 /drivers/net/wireless/orinoco/main.c
parent04024b937a6e9b7d4320b5853557cea3930d528c (diff)
parent8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/orinoco/main.c')
-rw-r--r--drivers/net/wireless/orinoco/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index f3d396e7544..62c6b2b37db 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1376,13 +1376,13 @@ static void orinoco_process_scan_results(struct work_struct *work)
spin_lock_irqsave(&priv->scan_lock, flags);
list_for_each_entry_safe(sd, temp, &priv->scan_list, list) {
- spin_unlock_irqrestore(&priv->scan_lock, flags);
buf = sd->buf;
len = sd->len;
type = sd->type;
list_del(&sd->list);
+ spin_unlock_irqrestore(&priv->scan_lock, flags);
kfree(sd);
if (len > 0) {