X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=net%2Frose%2Frose_timer.c;h=b6c8f38cc26c42025ea9b6c63558f2d032c1f92d;hb=fa93ca18a8b0da4e26bd9491ad144cd14d22f8ec;hp=50ae0371dab872e1ee0b51d11362d8f7de532f8b;hpb=c752f0739f09b803aed191c4765a3b6650a08653;p=linux-2.6-omap-h63xx.git

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 50ae0371dab..b6c8f38cc26 100644
--- 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;
 		}