diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-27 22:15:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-27 22:15:01 -0400 |
| commit | 7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch) | |
| tree | f6a3c26bccbd31e144c8c68fda979988739d4af5 /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (diff) | |
| parent | 643c61e119459e9d750087b7b34be94491efebf9 (diff) | |
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.c | 2 |
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) | |||
| 5652 | 5652 | ||
| 5653 | if (test_and_clear_bit(S_FW_ERROR, &il->status)) { | 5653 | if (test_and_clear_bit(S_FW_ERROR, &il->status)) { |
| 5654 | mutex_lock(&il->mutex); | 5654 | mutex_lock(&il->mutex); |
| 5655 | /* FIXME: do we dereference vif without mutex locked ? */ | ||
| 5656 | il->vif = NULL; | ||
| 5657 | il->is_open = 0; | 5655 | il->is_open = 0; |
| 5658 | 5656 | ||
| 5659 | __il4965_down(il); | 5657 | __il4965_down(il); |