From: Forrest Zhao <forrest.zhao@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: Forrest Zhao <forrest.zhao@intel.com>
Subject: [PATCH] fix the bug introduced by commit "re-use the sco_server initiated by audio plugin"
Date: Fri, 19 Jun 2009 13:30:22 +0800 [thread overview]
Message-ID: <1245389422-22318-1-git-send-email-forrest.zhao@intel.com> (raw)
---
audio/gateway.c | 3 ---
audio/main.c | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/audio/gateway.c b/audio/gateway.c
index a170bec..607a4a0 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -1079,9 +1079,6 @@ int gateway_connect_sco(struct audio_device *dev, GIOChannel *io)
{
struct gateway *gw = dev->gateway;
- if (gw->sco)
- return -EISCONN;
-
gw->sco = g_io_channel_ref(io);
return 0;
diff --git a/audio/main.c b/audio/main.c
index 4e5eda2..cf16fd4 100644
--- a/audio/main.c
+++ b/audio/main.c
@@ -93,6 +93,10 @@ static void sco_server_cb(GIOChannel *chan, GError *err, gpointer data)
device = manager_find_device(NULL, &src, &dst, AUDIO_HEADSET_INTERFACE,
FALSE);
if (!device)
+ device = manager_find_device(NULL, &src, &dst,
+ AUDIO_GATEWAY_INTERFACE, FALSE);
+
+ if (!device)
goto drop;
if (device->headset) {
--
1.5.4.5
next reply other threads:[~2009-06-19 5:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-19 5:30 Forrest Zhao [this message]
2009-06-19 13:01 ` [PATCH] fix the bug introduced by commit "re-use the sco_server initiated by audio plugin" Johan Hedberg
2009-06-19 15:38 ` 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=1245389422-22318-1-git-send-email-forrest.zhao@intel.com \
--to=forrest.zhao@intel.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