diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 09:12:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 09:12:33 -0800 |
| commit | 5c1af2a7011bf719807de360cb64c2f610269a38 (patch) | |
| tree | fc4e6657d30c6eb48367c40e50c6b7428f96aaea /net/mac80211/scan.c | |
| parent | ef7848683f4de4903376638b69e6b4ac729b3ead (diff) | |
| parent | 573e5bbe653d01dc0f27e2d97754db9246b501c8 (diff) | |
| download | olio-linux-3.10-5c1af2a7011bf719807de360cb64c2f610269a38.tar.xz olio-linux-3.10-5c1af2a7011bf719807de360cb64c2f610269a38.zip | |
Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/pm
From Kukjin Kim:
* 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add flush_cache_all in suspend finisher
ARM: EXYNOS: Remove scu_enable from cpuidle
ARM: EXYNOS: Fix soft reboot hang after suspend/resume
ARM: EXYNOS: Add support for rtc wakeup
ARM: EXYNOS: fix the hotplug for Cortex-A15
+ Linux 3.7-rc6
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 c4cdbde24fd..43e60b5a754 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); |