diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-26 22:32:28 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-26 22:32:28 +0400 |
| commit | 78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b (patch) | |
| tree | aa65a89a09cd28f7b305c4f27a47903996b5b365 /drivers/net/wireless/ath/carl9170/main.c | |
| parent | b9958a951ed4f8adff9ce02c2b1cb4ede8e2aa0e (diff) | |
| parent | 822395b591db32ad3cf8a5b57b0fe30fb8d12c37 (diff) | |
| download | linux-78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 3cc99f3f7ab5..980ae70ea424 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -639,8 +639,8 @@ init: if (err) goto unlock; } else { - err = carl9170_mod_virtual_mac(ar, vif_id, vif->addr); rcu_read_unlock(); + err = carl9170_mod_virtual_mac(ar, vif_id, vif->addr); if (err) goto unlock; |