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/cmtp | |
parent | ce7e4ad1436a0139c16225f2376134cff3ad24fe (diff) | |
parent | 33cb722c22f28964a501a56cc76397834c221c7a (diff) | |
download | linux-5c69b0ada634bca4111fcc332df5fad2447ec90f.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'net/bluetooth/cmtp')
-rw-r--r-- | net/bluetooth/cmtp/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 9e8940b24bba..6c9c1fd601ca 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -65,14 +65,12 @@ static struct cmtp_session *__cmtp_get_session(bdaddr_t *bdaddr) static void __cmtp_link_session(struct cmtp_session *session) { - __module_get(THIS_MODULE); list_add(&session->list, &cmtp_session_list); } static void __cmtp_unlink_session(struct cmtp_session *session) { list_del(&session->list); - module_put(THIS_MODULE); } static void __cmtp_copy_session(struct cmtp_session *session, struct cmtp_conninfo *ci) @@ -325,6 +323,7 @@ static int cmtp_session(void *arg) up_write(&cmtp_session_sem); kfree(session); + module_put_and_exit(0); return 0; } @@ -374,9 +373,11 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock) __cmtp_link_session(session); + __module_get(THIS_MODULE); session->task = kthread_run(cmtp_session, session, "kcmtpd_ctr_%d", session->num); if (IS_ERR(session->task)) { + module_put(THIS_MODULE); err = PTR_ERR(session->task); goto unlink; } |