From: Arik Nemtsov <arik@wizery.com>
To: <linux-bluetooth@vger.kernel.org>
Cc: Arik Nemtsov <arik@wizery.com>
Subject: [PATCH 1/2] device: don't auto-connect on disc-cb attio callback registration
Date: Thu, 8 Mar 2012 15:44:38 +0200 [thread overview]
Message-ID: <1331214279-27521-1-git-send-email-arik@wizery.com> (raw)
If a device is already connected, don't auto-connect if we register
a disconnect-only attio callback. This will obviously fail.
---
src/device.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/device.c b/src/device.c
index dfc8e59..b339ac1 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2942,10 +2942,15 @@ guint btd_device_add_attio_callback(struct btd_device *device,
attio->dcfunc = dcfunc;
attio->user_data = user_data;
- if (device->attrib && cfunc) {
- device->attios_offline = g_slist_append(device->attios_offline,
- attio);
- g_idle_add(notify_attios, device);
+ if (device->attrib) {
+ if (cfunc) {
+ device->attios_offline =
+ g_slist_append(device->attios_offline, attio);
+
+ g_idle_add(notify_attios, device);
+ } else {
+ device->attios = g_slist_append(device->attios, attio);
+ }
} else {
device->auto_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
att_connect, device,
--
1.7.5.4
next reply other threads:[~2012-03-08 13:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 13:44 Arik Nemtsov [this message]
2012-03-08 13:44 ` [PATCH 2/2] Revert "core: Add provision for terminating an ATT connection" Arik Nemtsov
2012-03-08 13:47 ` Arik Nemtsov
2012-03-14 12:08 ` Anderson Lizardo
2012-03-14 12:11 ` Arik Nemtsov
2012-03-14 12:40 ` Anderson Lizardo
2012-03-14 12:03 ` [PATCH 1/2] device: don't auto-connect on disc-cb attio callback registration Anderson Lizardo
2012-03-14 12:09 ` Arik Nemtsov
2012-03-14 12:49 ` Anderson Lizardo
2012-03-15 10:13 ` 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=1331214279-27521-1-git-send-email-arik@wizery.com \
--to=arik@wizery.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;
as well as URLs for NNTP newsgroup(s).