aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/4965-mac.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-27 22:15:01 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-27 22:15:01 -0400
commit7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch)
treef6a3c26bccbd31e144c8c68fda979988739d4af5 /drivers/net/wireless/iwlegacy/4965-mac.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentrtlwifi: rtl8192ce: rtl8192cu: rtl8192de: Fix low-gain setting when scanning (diff)
downloadlinux-dev-7dd30d447b7f4a129586cce8e57d0163dde876b0.tar.xz
linux-dev-7dd30d447b7f4a129586cce8e57d0163dde876b0.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 17f1c6853182..c46275a92565 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5652,8 +5652,6 @@ il4965_bg_restart(struct work_struct *data)
if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
mutex_lock(&il->mutex);
- /* FIXME: do we dereference vif without mutex locked ? */
- il->vif = NULL;
il->is_open = 0;
__il4965_down(il);