Linux bluetooth development
 help / color / mirror / Atom feed
From: Slawomir Bochenski <lkslawek@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Slawomir Bochenski <lkslawek@gmail.com>
Subject: [PATCH obexd 1/4] Reverse order of calls in os_reset_session
Date: Wed,  5 Oct 2011 16:32:37 +0200	[thread overview]
Message-ID: <1317825160-21429-1-git-send-email-lkslawek@gmail.com> (raw)

This replaces:
service->get/put, mime->open, ..., service->reset, mime->close
logic, with a more appropriate:
service->get/put, mime->open, ..., mime->close, service->reset
---
 src/obex.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/obex.c b/src/obex.c
index d8f4648..938937c 100644
--- a/src/obex.c
+++ b/src/obex.c
@@ -284,8 +284,6 @@ static void os_session_mark_aborted(struct obex_session *os)
 static void os_reset_session(struct obex_session *os)
 {
 	os_session_mark_aborted(os);
-	if (os->service && os->service->reset)
-		os->service->reset(os, os->service_data);
 
 	if (os->object) {
 		os->driver->set_io_watch(os->object, NULL, NULL);
@@ -297,6 +295,9 @@ static void os_reset_session(struct obex_session *os)
 			os->driver->remove(os->path);
 	}
 
+	if (os->service && os->service->reset)
+		os->service->reset(os, os->service_data);
+
 	if (os->name) {
 		g_free(os->name);
 		os->name = NULL;
-- 
1.7.4.1


             reply	other threads:[~2011-10-05 14:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-05 14:32 Slawomir Bochenski [this message]
2011-10-05 14:32 ` [PATCH obexd 2/4] Fix missing format in call to g_error_new Slawomir Bochenski
2011-10-05 14:32 ` [PATCH obexd 3/4] Write pending bytes only if mime object is open Slawomir Bochenski
2011-10-05 14:32 ` [PATCH obexd 4/4] Simplify code for calling mime driver flush() Slawomir Bochenski
2011-10-05 15:04   ` Slawomir Bochenski
2011-10-05 15:06   ` Luiz Augusto von Dentz
2011-10-05 15:17     ` Slawomir Bochenski
2011-10-05 15:20       ` Slawomir Bochenski
2011-10-05 15:38         ` Luiz Augusto von Dentz
2011-10-05 16:12           ` Slawomir Bochenski
2011-10-05 16:43             ` Luiz Augusto von Dentz
2011-10-05 17:28               ` Slawomir Bochenski
2011-10-06  7:44           ` Hendrik Sattler
2011-10-06  8:17             ` Luiz Augusto von Dentz
2011-10-06  8:21               ` Slawomir Bochenski
2011-10-06  9:17                 ` Luiz Augusto von Dentz
2011-10-06 12:07                   ` Slawomir Bochenski
2011-10-06 10:10               ` Hendrik Sattler
2011-10-06  8:23   ` Johan Hedberg
2011-10-05 14:40 ` [PATCH obexd 1/4] Reverse order of calls in os_reset_session Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317825160-21429-1-git-send-email-lkslawek@gmail.com \
    --to=lkslawek@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox