mac80211: fix initialisation error path
Johannes Berg
maintainerPATCH 1/1 mac80211: fix initialisation error path
The error handling in ieee80211_init() is broken when any of the built-in rate control algorithms fail to initialise, fix it and rename the error labels.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/ieee80211.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/mac80211/ieee80211.c +7 -7
@@ -1684,28 +1684,28 @@ static int __init ieee80211_init(void) ret =rc80211_simple_init ();if (ret) - goto fail; + goto out; ret =rc80211_pid_init ();if (ret) - goto fail_simple; + goto out_cleanup_simple; ret =ieee80211_wme_register ();if (ret) {printk (KERN_DEBUG "ieee80211_init: failed to " "initialize WME (err=%d)\n" , ret); - goto fail_pid; + goto out_cleanup_pid; }ieee80211_debugfs_netdev_init ();return 0 ; - fail_pid: -rc80211_simple_exit (); - fail_simple: + out_cleanup_pid:rc80211_pid_exit (); - fail: + out_cleanup_simple: +rc80211_simple_exit (); + out:return ret; }