git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register
[pandora-kernel.git]
/
net
/
rose
/
rose_timer.c
diff --git
a/net/rose/rose_timer.c
b/net/rose/rose_timer.c
index
50ae037
..
b6c8f38
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;
}