diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-23 20:56:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-23 20:56:23 -0500 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /net/bluetooth/rfcomm | |
| parent | 908a7a16b852ffd618a9127be8d62432182d81b4 (diff) | |
| parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
Diffstat (limited to 'net/bluetooth/rfcomm')
| -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 37c640d1c3fd..acd84fd524b8 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
| @@ -1781,8 +1781,6 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s) | |||
| 1781 | if (err < 0) | 1781 | if (err < 0) |
| 1782 | return; | 1782 | return; |
| 1783 | 1783 | ||
| 1784 | __module_get(nsock->ops->owner); | ||
| 1785 | |||
| 1786 | /* Set our callbacks */ | 1784 | /* Set our callbacks */ |
| 1787 | nsock->sk->sk_data_ready = rfcomm_l2data_ready; | 1785 | nsock->sk->sk_data_ready = rfcomm_l2data_ready; |
| 1788 | nsock->sk->sk_state_change = rfcomm_l2state_change; | 1786 | nsock->sk->sk_state_change = rfcomm_l2state_change; |