Linux bluetooth development
 help / color / mirror / Atom feed
From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [PATCH 2/4] audio: gateway_unlock together with in_use = FALSE
Date: Thu, 15 Dec 2011 11:01:05 +0100	[thread overview]
Message-ID: <1323943267-14576-3-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1323943267-14576-1-git-send-email-mikel.astiz.oss@gmail.com>

From: Mikel Astiz <mikel.astiz@bmw-carit.de>

Calling gateway_unlock seems safer in gateway_suspend_complete, in
combination with the update of transport->in_use. This avoids the
transitional state of having the gateway unlocked but the transport
still in use.

This approach is also more consistent with the way headset and a2dp
handle it.
---
 audio/transport.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/audio/transport.c b/audio/transport.c
index 6029528..fc7026e 100644
--- a/audio/transport.c
+++ b/audio/transport.c
@@ -510,6 +510,7 @@ static gboolean gateway_suspend_complete(gpointer user_data)
 {
 	struct media_owner *owner = user_data;
 	struct media_transport *transport = owner->transport;
+	struct audio_device *device = transport->device;
 
 	/* Release always succeeds */
 	if (owner->pending) {
@@ -518,6 +519,7 @@ static gboolean gateway_suspend_complete(gpointer user_data)
 		media_owner_remove(owner);
 	}
 
+	gateway_unlock(device, GATEWAY_LOCK_READ | GATEWAY_LOCK_WRITE);
 	transport->in_use = FALSE;
 	media_transport_remove(transport, owner);
 	return FALSE;
@@ -535,7 +537,6 @@ static guint suspend_gateway(struct media_transport *transport,
 		return 0;
 	}
 
-	gateway_unlock(device, GATEWAY_LOCK_READ | GATEWAY_LOCK_WRITE);
 	g_idle_add(gateway_suspend_complete, owner);
 	return id++;
 }
-- 
1.7.6.4


  parent reply	other threads:[~2011-12-15 10:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-15 10:01 [PATCH 0/4] Minor audio-related fixes Mikel Astiz
2011-12-15 10:01 ` [PATCH 1/4] audio: remove unnecessary method call Mikel Astiz
2011-12-15 11:46   ` Luiz Augusto von Dentz
2011-12-30 11:16     ` Johan Hedberg
2011-12-15 10:01 ` Mikel Astiz [this message]
2011-12-15 11:48   ` [PATCH 2/4] audio: gateway_unlock together with in_use = FALSE Luiz Augusto von Dentz
2011-12-15 10:01 ` [PATCH 3/4] a2dp: return NotSupported error if no server found Mikel Astiz
2011-12-15 11:49   ` Luiz Augusto von Dentz
2011-12-15 10:01 ` [PATCH 4/4] audio: do not disconnect on gateway SCO failure Mikel Astiz
2011-12-15 11:51   ` Luiz Augusto von Dentz

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=1323943267-14576-3-git-send-email-mikel.astiz.oss@gmail.com \
    --to=mikel.astiz.oss@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=mikel.astiz@bmw-carit.de \
    /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