diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 10:12:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 10:12:54 -0800 |
| commit | 7ef5f41c16fdddfc14e882a57200334614d8ffd6 (patch) | |
| tree | 5b6b4f59587e826993cead051fd42e08d2b590da /net/bluetooth/rfcomm/core.c | |
| parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) | |
| parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ppp: fix segfaults introduced by netdev_priv changes
net: Fix module refcount leak in kernel_accept()
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index ba537fae0a4..ce68e046d96 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1786,8 +1786,6 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s) if (err < 0) return; - __module_get(nsock->ops->owner); - /* Set our callbacks */ nsock->sk->sk_data_ready = rfcomm_l2data_ready; nsock->sk->sk_state_change = rfcomm_l2state_change; |