diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 08:46:23 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 08:46:23 -0700 |
| commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
| tree | f9a21a6902e1857274775b96d561d8be17287860 /net/tipc | |
| parent | Input: atmel_mxt_ts - split out touchpad initialisation logic (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | wireguard-linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.xz wireguard-linux-5f63e885ac32429fc1340f5a61e1484022efc773.zip | |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 935205e6bcfe..be1c9fa60b09 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -152,11 +152,11 @@ out_netlink: static void __exit tipc_exit(void) { tipc_bearer_cleanup(); + unregister_pernet_subsys(&tipc_net_ops); tipc_netlink_stop(); tipc_netlink_compat_stop(); tipc_socket_stop(); tipc_unregister_sysctl(); - unregister_pernet_subsys(&tipc_net_ops); pr_info("Deactivated\n"); } |