* [PATCH] Bluetooth: cmtp: Fix session cleanup on failed conn add
@ 2011-08-05 14:53 Peter Hurley
2011-08-11 21:08 ` Gustavo Padovan
0 siblings, 1 reply; 2+ messages in thread
From: Peter Hurley @ 2011-08-05 14:53 UTC (permalink / raw)
To: linux-bluetooth
Once the session thread is running, cleanup must be handled
by the session thread only.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
net/bluetooth/cmtp/core.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 42cb2f4..521baa4 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -382,16 +382,17 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
if (!(session->flags & (1 << CMTP_LOOPBACK))) {
err = cmtp_attach_device(session);
- if (err < 0)
- goto detach;
+ if (err < 0) {
+ atomic_inc(&session->terminate);
+ wake_up_process(session->task);
+ up_write(&cmtp_session_sem);
+ return err;
+ }
}
up_write(&cmtp_session_sem);
return 0;
-detach:
- cmtp_detach_device(session);
-
unlink:
__cmtp_unlink_session(session);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Bluetooth: cmtp: Fix session cleanup on failed conn add
2011-08-05 14:53 [PATCH] Bluetooth: cmtp: Fix session cleanup on failed conn add Peter Hurley
@ 2011-08-11 21:08 ` Gustavo Padovan
0 siblings, 0 replies; 2+ messages in thread
From: Gustavo Padovan @ 2011-08-11 21:08 UTC (permalink / raw)
To: Peter Hurley; +Cc: linux-bluetooth
Hi Peter,
* Peter Hurley <peter@hurleysoftware.com> [2011-08-05 10:53:52 -0400]:
> Once the session thread is running, cleanup must be handled
> by the session thread only.
>
> Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
> ---
> net/bluetooth/cmtp/core.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
Applied, Thanks.
Gustavo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-11 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-05 14:53 [PATCH] Bluetooth: cmtp: Fix session cleanup on failed conn add Peter Hurley
2011-08-11 21:08 ` Gustavo Padovan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).