diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
| commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
| tree | 25ccce9c837fbc7beef026b46852197b637be901 /net/mac80211 | |
| parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
| parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) | |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/offchannel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 83608ac16780..2c84185dfdb0 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -458,8 +458,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata) | |||
| 458 | list_move_tail(&roc->list, &tmp_list); | 458 | list_move_tail(&roc->list, &tmp_list); |
| 459 | roc->abort = true; | 459 | roc->abort = true; |
| 460 | } | 460 | } |
| 461 | |||
| 462 | ieee80211_start_next_roc(local); | ||
| 463 | mutex_unlock(&local->mtx); | 461 | mutex_unlock(&local->mtx); |
| 464 | 462 | ||
| 465 | list_for_each_entry_safe(roc, tmp, &tmp_list, list) { | 463 | list_for_each_entry_safe(roc, tmp, &tmp_list, list) { |