Merge branch 'merge'

1 files changed, 1 insertions, 1 deletions

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 75b72d389ba9..ddba1c144260 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -138,8 +138,8 @@ static void nr_heartbeat_expiry(unsigned long param)
                 if (sock_flag(sk, SOCK_DESTROY) ||
                     (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
                         sock_hold(sk);
-                        nr_destroy_socket(sk);
                         bh_unlock_sock(sk);
+                        nr_destroy_socket(sk);
                         sock_put(sk);
                         return;
                 }