diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 21:08:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 21:08:26 +0100 |
| commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
| tree | 073ea7b46809bf804134cbf008a593413c02a99c /net | |
| parent | c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9 (diff) | |
| parent | c20137fc5329eaf24093fc48c52608dc66be8e5c (diff) | |
| download | linux-db8862eafe8a5d030a3b02e81b8bb47447c315e3.tar.gz linux-db8862eafe8a5d030a3b02e81b8bb47447c315e3.tar.bz2 linux-db8862eafe8a5d030a3b02e81b8bb47447c315e3.zip | |
Merge branch 'linus' into tracing/hw-branch-tracing
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 | ||||
| -rw-r--r-- | net/socket.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index ba537fae0a4c..ce68e046d963 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; diff --git a/net/socket.c b/net/socket.c index 92764d836891..76ba80aeac1a 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2307,6 +2307,7 @@ int kernel_accept(struct socket *sock, struct socket **newsock, int flags) } (*newsock)->ops = sock->ops; + __module_get((*newsock)->ops->owner); done: return err; |