diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-03 08:26:25 +0900 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-03 08:26:25 +0900 |
| commit | 5c69b0ada634bca4111fcc332df5fad2447ec90f (patch) | |
| tree | d54e608075292c97e54bfd182ceef061aa3fc7df /net/bluetooth/bnep | |
| parent | ce7e4ad1436a0139c16225f2376134cff3ad24fe (diff) | |
| parent | 33cb722c22f28964a501a56cc76397834c221c7a (diff) | |
| download | linux-stable-5c69b0ada634bca4111fcc332df5fad2447ec90f.tar.gz linux-stable-5c69b0ada634bca4111fcc332df5fad2447ec90f.tar.bz2 linux-stable-5c69b0ada634bca4111fcc332df5fad2447ec90f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'net/bluetooth/bnep')
| -rw-r--r-- | net/bluetooth/bnep/core.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index a6cd856046ab..42d53b85a808 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -77,17 +77,12 @@ static struct bnep_session *__bnep_get_session(u8 *dst) static void __bnep_link_session(struct bnep_session *s) { - /* It's safe to call __module_get() here because sessions are added - by the socket layer which has to hold the reference to this module. - */ - __module_get(THIS_MODULE); list_add(&s->list, &bnep_session_list); } static void __bnep_unlink_session(struct bnep_session *s) { list_del(&s->list); - module_put(THIS_MODULE); } static int bnep_send(struct bnep_session *s, void *data, size_t len) @@ -528,6 +523,7 @@ static int bnep_session(void *arg) up_write(&bnep_session_sem); free_netdev(dev); + module_put_and_exit(0); return 0; } @@ -614,9 +610,11 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock) __bnep_link_session(s); + __module_get(THIS_MODULE); s->task = kthread_run(bnep_session, s, "kbnepd %s", dev->name); if (IS_ERR(s->task)) { /* Session thread start failed, gotta cleanup. */ + module_put(THIS_MODULE); unregister_netdev(dev); __bnep_unlink_session(s); err = PTR_ERR(s->task); |