Merge commit 'v3.17' into next

1 files changed, 4 insertions, 2 deletions

diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index 7c59ab1d6ecb..2d13eea8574a 100644
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
@@ -84,11 +84,13 @@ void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub)
 void tipc_nodesub_notify(struct list_head *nsub_list)
 {
         struct tipc_node_subscr *ns, *safe;
+        net_ev_handler handle_node_down;
 
         list_for_each_entry_safe(ns, safe, nsub_list, nodesub_list) {
-                if (ns->handle_node_down) {
-                        ns->handle_node_down(ns->usr_handle);
+                handle_node_down = ns->handle_node_down;
+                if (handle_node_down) {
                         ns->handle_node_down = NULL;
+                        handle_node_down(ns->usr_handle);
                 }
         }
 }