Merge branch 'topic/jack' into for-linus

[linux-drm-fsl-dcu.git] / net / rose / rose_timer.c

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 50ae0371dab872e1ee0b51d11362d8f7de532f8b..b6c8f38cc26c42025ea9b6c63558f2d032c1f92d 100644 (file)
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -138,6 +138,7 @@ static void rose_heartbeat_expiry(unsigned long param)
                   is accepted() it isn't 'dead' so doesn't get removed. */
                if (sock_flag(sk, SOCK_DESTROY) ||
                    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
+                       bh_unlock_sock(sk);
                        rose_destroy_socket(sk);
                        return;
                }