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>
This commit is contained in:
parent
5904d20676
commit
11ba964d4f
|
@ -930,7 +930,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
|
||||||
fail_workqueue:
|
fail_workqueue:
|
||||||
wiphy_unregister(local->hw.wiphy);
|
wiphy_unregister(local->hw.wiphy);
|
||||||
fail_wiphy_register:
|
fail_wiphy_register:
|
||||||
kfree(local->int_scan_req->channels);
|
kfree(local->int_scan_req);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ieee80211_register_hw);
|
EXPORT_SYMBOL(ieee80211_register_hw);
|
||||||
|
|
Loading…
Reference in New Issue