From a1a01a6f95fb3715dd7aa27af3543b6cb0a62da7 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 14 Aug 2015 11:29:27 +0300 Subject: [PATCH] audio: Fix not resetting connect_id Ever since discovery can be canceled connect_id is now set while discovering so it needs to be reset on the callback otherwise it will cause .connect to always return -EBUSY until .disconnect is called. --- profiles/audio/sink.c | 2 ++ profiles/audio/source.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c index 1c3673597..3af8e0f67 100644 --- a/profiles/audio/sink.c +++ b/profiles/audio/sink.c @@ -227,6 +227,8 @@ static void discovery_complete(struct avdtp *session, GSList *seps, struct avdtp struct sink *sink = user_data; int id, perr; + sink->connect_id = 0; + if (err) { avdtp_unref(sink->session); sink->session = NULL; diff --git a/profiles/audio/source.c b/profiles/audio/source.c index 16a828719..c036208c6 100644 --- a/profiles/audio/source.c +++ b/profiles/audio/source.c @@ -227,6 +227,8 @@ static void discovery_complete(struct avdtp *session, GSList *seps, struct avdtp struct source *source = user_data; int id, perr; + source->connect_id = 0; + if (err) { avdtp_unref(source->session); source->session = NULL; -- 2.47.3