diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-22 21:22:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-22 21:22:39 +0100 |
commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /net/mac80211/scan.c | |
parent | ALSA: emu10k1: Add missing ifdef for emu->suspend reference (diff) | |
parent | ALSA: snd-usb: properly initialize the sync endpoint (diff) | |
download | linux-dev-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz linux-dev-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index c4cdbde24fd3..43e60b5a7546 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -917,7 +917,7 @@ int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, struct cfg80211_sched_scan_request *req) { struct ieee80211_local *local = sdata->local; - struct ieee80211_sched_scan_ies sched_scan_ies; + struct ieee80211_sched_scan_ies sched_scan_ies = {}; int ret, i; mutex_lock(&local->mtx); |