From: Ralf Baechle Date: Tue, 11 Jul 2006 03:21:05 +0000 (-0700) Subject: [NETROM]: Drop lock before calling nr_destroy_socket X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8bf2b7b1888babe182a503437f6d40062aa84037;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [NETROM]: Drop lock before calling nr_destroy_socket nr_destroy_socket takes the socket lock itself so it should better be called with the socket unlocked. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller --- 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; }