X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fx25%2Fx25_timer.c;fp=net%2Fx25%2Fx25_timer.c;h=0a92e1da3922dc802b51cc93dd0d9f8a0a9d2f22;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=71ff3088f6fe325cb7321df423566ce59e420b5e;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 71ff3088f..0a92e1da3 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -114,9 +114,8 @@ static void x25_heartbeat_expiry(unsigned long param)
 			if (sock_flag(sk, SOCK_DESTROY) ||
 			    (sk->sk_state == TCP_LISTEN &&
 			     sock_flag(sk, SOCK_DEAD))) {
-				bh_unlock_sock(sk);
 				x25_destroy_socket(sk);
-				return;
+				goto unlock;
 			}
 			break;
 
@@ -129,6 +128,7 @@ static void x25_heartbeat_expiry(unsigned long param)
 	}
 restart_heartbeat:
 	x25_start_heartbeat(sk);
+unlock:
 	bh_unlock_sock(sk);
 }