aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-08-19 19:45:50 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:36:07 -0400
commit11ba964d4f936609a04e8b9f2051f6027ef761ae (patch)
tree82bcec21fef9364e1fb27cb4091c7950eadcf7ad /net/mac80211/main.c
parent5904d2067680e9bb73a4816fa6b9eec49355c9c8 (diff)
mac80211: fix register_hw error path
"cfg80211: fix alignment problem in scan request" introduced a bug into the error path, because now we allocate the entire scan request and not just the channel list (the channel list is allocated together with the scan request) -- on errors we thus also need to free the entire scan request. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index f80efd7ff5e..dd3b0816614 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -930,7 +930,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
fail_workqueue:
wiphy_unregister(local->hw.wiphy);
fail_wiphy_register:
- kfree(local->int_scan_req->channels);
+ kfree(local->int_scan_req);
return result;
}
EXPORT_SYMBOL(ieee80211_register_hw);